mfd: max14577: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:42:52 +0000 (23:42 +0100)
committerLee Jones <lee@kernel.org>
Wed, 7 Dec 2022 13:27:22 +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-439-uwe@kleine-koenig.org
drivers/mfd/max14577.c

index d44ad6f337425a9223315465e73287a0d65a5f91..11211039ed901197316efb0f99743c872685d77f 100644 (file)
@@ -358,9 +358,9 @@ static void max77836_remove(struct max14577 *max14577)
        i2c_unregister_device(max14577->i2c_pmic);
 }
 
-static int max14577_i2c_probe(struct i2c_client *i2c,
-                             const struct i2c_device_id *id)
+static int max14577_i2c_probe(struct i2c_client *i2c)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
        struct max14577 *max14577;
        struct max14577_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct device_node *np = i2c->dev.of_node;
@@ -523,7 +523,7 @@ static struct i2c_driver max14577_i2c_driver = {
                .pm = &max14577_pm,
                .of_match_table = max14577_dt_match,
        },
-       .probe = max14577_i2c_probe,
+       .probe_new = max14577_i2c_probe,
        .remove = max14577_i2c_remove,
        .id_table = max14577_i2c_id,
 };