OSDN Git Service

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

index f716ab8..15d25b0 100644 (file)
@@ -106,9 +106,9 @@ static const struct regmap_config rsmu_sl_regmap_config = {
        .can_multi_write = true,
 };
 
-static int rsmu_i2c_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int rsmu_i2c_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        const struct regmap_config *cfg;
        struct rsmu_ddata *rsmu;
        int ret;
@@ -180,7 +180,7 @@ static struct i2c_driver rsmu_i2c_driver = {
                .name = "rsmu-i2c",
                .of_match_table = of_match_ptr(rsmu_i2c_of_match),
        },
-       .probe = rsmu_i2c_probe,
+       .probe_new = rsmu_i2c_probe,
        .remove = rsmu_i2c_remove,
        .id_table = rsmu_i2c_id,
 };