mfd: max8998: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:42:59 +0000 (23:42 +0100)
committerLee Jones <lee@kernel.org>
Wed, 7 Dec 2022 13:27:23 +0000 (13:27 +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>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221118224540.619276-446-uwe@kleine-koenig.org
drivers/mfd/max8998.c

index 0eb15e611b671f243265e9d74a9ccd3e5573c075..122f7b931f5a22ff00234846f9f9f764ea03ea81 100644 (file)
@@ -162,9 +162,9 @@ static inline unsigned long max8998_i2c_get_driver_data(struct i2c_client *i2c,
        return id->driver_data;
 }
 
-static int max8998_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int max8998_i2c_probe(struct i2c_client *i2c)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
        struct max8998_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct max8998_dev *max8998;
        int ret = 0;
@@ -348,7 +348,7 @@ static struct i2c_driver max8998_i2c_driver = {
                   .suppress_bind_attrs = true,
                   .of_match_table = of_match_ptr(max8998_dt_match),
        },
-       .probe = max8998_i2c_probe,
+       .probe_new = max8998_i2c_probe,
        .id_table = max8998_i2c_id,
 };