OSDN Git Service

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

index 8166949..22131cf 100644 (file)
@@ -683,9 +683,9 @@ bool si476x_core_is_powered_up(struct si476x_core *core)
 }
 EXPORT_SYMBOL_GPL(si476x_core_is_powered_up);
 
-static int si476x_core_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int si476x_core_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        int rval;
        struct si476x_core          *core;
        struct si476x_platform_data *pdata;
@@ -866,7 +866,7 @@ static struct i2c_driver si476x_core_driver = {
        .driver         = {
                .name   = "si476x-core",
        },
-       .probe          = si476x_core_probe,
+       .probe_new      = si476x_core_probe,
        .remove         = si476x_core_remove,
        .id_table       = si476x_id,
 };