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

index d5d0ec117acb270ebb9946d7223a1404ba1c6e65..b0f4fff5872dd26343d98b8a3addc2b8201dc5f6 100644 (file)
@@ -352,9 +352,9 @@ tc3589x_of_probe(struct device *dev, enum tc3589x_version *version)
        return pdata;
 }
 
-static int tc3589x_probe(struct i2c_client *i2c,
-                                  const struct i2c_device_id *id)
+static int tc3589x_probe(struct i2c_client *i2c)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
        struct device_node *np = i2c->dev.of_node;
        struct tc3589x_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct tc3589x *tc3589x;
@@ -486,7 +486,7 @@ static struct i2c_driver tc3589x_driver = {
                .pm     = &tc3589x_dev_pm_ops,
                .of_match_table = of_match_ptr(tc3589x_match),
        },
-       .probe          = tc3589x_probe,
+       .probe_new      = tc3589x_probe,
        .remove         = tc3589x_remove,
        .id_table       = tc3589x_id,
 };