From c9f9ef15b84222f4cc686b1013ee3fd192b0bab8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 18 Nov 2022 23:44:48 +0100 Subject: [PATCH] regulator: pv88080-regulator: Convert to i2c's .probe_new() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit .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 Acked-for-MFD-by: Lee Jones Acked-for-Backlight-by: Lee Jones Link: https://lore.kernel.org/r/20221118224540.619276-555-uwe@kleine-koenig.org Signed-off-by: Mark Brown --- drivers/regulator/pv88080-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88080-regulator.c index 2a74cc0..15a67c0 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, }; -- 2.7.4