mfd: mc13xxx-i2c: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:43:00 +0000 (23:43 +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-447-uwe@kleine-koenig.org
drivers/mfd/mc13xxx-i2c.c

index eb94f30..9593e2b 100644 (file)
@@ -52,9 +52,9 @@ static const struct regmap_config mc13xxx_regmap_i2c_config = {
        .cache_type = REGCACHE_NONE,
 };
 
-static int mc13xxx_i2c_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int mc13xxx_i2c_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct mc13xxx *mc13xxx;
        int ret;
 
@@ -96,7 +96,7 @@ static struct i2c_driver mc13xxx_i2c_driver = {
                .name = "mc13xxx",
                .of_match_table = mc13xxx_dt_ids,
        },
-       .probe = mc13xxx_i2c_probe,
+       .probe_new = mc13xxx_i2c_probe,
        .remove = mc13xxx_i2c_remove,
 };