summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:44:48 +0100
committerMark Brown <broonie@kernel.org>2022-11-24 14:54:09 +0100
commitc9f9ef15b84222f4cc686b1013ee3fd192b0bab8 (patch)
tree16603b138386ebe74ced6054108ffbac9d9eab45
parentregulator: pfuze100-regulator: Convert to i2c's .probe_new() (diff)
downloadlinux-c9f9ef15b84222f4cc686b1013ee3fd192b0bab8.tar.xz
linux-c9f9ef15b84222f4cc686b1013ee3fd192b0bab8.zip
regulator: pv88080-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 <u.kleine-koenig@pengutronix.de> Acked-for-MFD-by: Lee Jones <lee@kernel.org> Acked-for-Backlight-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20221118224540.619276-555-uwe@kleine-koenig.org Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/pv88080-regulator.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88080-regulator.c
index 2a74cc05acfe..15a67c05f519 100644
--- a/drivers/regulator/pv88080-regulator.c
+++ b/drivers/regulator/pv88080-regulator.c
@@ -374,9 +374,9 @@ error_i2c:
/*
* I2C driver interface functions
*/
-static int pv88080_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int pv88080_i2c_probe(struct i2c_client *i2c)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
struct regulator_init_data *init_data = dev_get_platdata(&i2c->dev);
struct pv88080 *chip;
const struct pv88080_compatible_regmap *regmap_config;
@@ -559,7 +559,7 @@ static struct i2c_driver pv88080_regulator_driver = {
.name = "pv88080",
.of_match_table = of_match_ptr(pv88080_dt_ids),
},
- .probe = pv88080_i2c_probe,
+ .probe_new = pv88080_i2c_probe,
.id_table = pv88080_i2c_id,
};