Skip to content

Commit 3d2a78a

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
regulator: act8865-regulator: Convert to i2c's .probe_new()
.probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Signed-off-by: Uwe Kleine-König <[email protected]> Acked-for-MFD-by: Lee Jones <[email protected]> Acked-for-Backlight-by: Lee Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent dd0df58 commit 3d2a78a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/regulator/act8865-regulator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -651,9 +651,9 @@ static int act8600_charger_probe(struct device *dev, struct regmap *regmap)
651651
return PTR_ERR_OR_ZERO(charger);
652652
}
653653

654-
static int act8865_pmic_probe(struct i2c_client *client,
655-
const struct i2c_device_id *i2c_id)
654+
static int act8865_pmic_probe(struct i2c_client *client)
656655
{
656+
const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client);
657657
const struct regulator_desc *regulators;
658658
struct act8865_platform_data *pdata = NULL;
659659
struct device *dev = &client->dev;
@@ -790,7 +790,7 @@ static struct i2c_driver act8865_pmic_driver = {
790790
.driver = {
791791
.name = "act8865",
792792
},
793-
.probe = act8865_pmic_probe,
793+
.probe_new = act8865_pmic_probe,
794794
.id_table = act8865_ids,
795795
};
796796

0 commit comments

Comments
 (0)