regulator: max8660: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:43 +0000 (23:44 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 23 Nov 2022 14:17:43 +0000 (14:17 +0000)
.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-550-uwe@kleine-koenig.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/max8660.c

index 347043a5a9a7df999722fd73870cda070123abbd..711623be8eb5c39f0ce6b0266d31d5554a7824fd 100644 (file)
@@ -367,9 +367,9 @@ static inline int max8660_pdata_from_dt(struct device *dev,
 }
 #endif
 
-static int max8660_probe(struct i2c_client *client,
-                                  const struct i2c_device_id *i2c_id)
+static int max8660_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client);
        struct device *dev = &client->dev;
        struct max8660_platform_data pdata_of, *pdata = dev_get_platdata(dev);
        struct regulator_config config = { };
@@ -503,7 +503,7 @@ static const struct i2c_device_id max8660_id[] = {
 MODULE_DEVICE_TABLE(i2c, max8660_id);
 
 static struct i2c_driver max8660_driver = {
-       .probe = max8660_probe,
+       .probe_new = max8660_probe,
        .driver         = {
                .name   = "max8660",
        },