mfd: adp5520: Convert to i2c's .probe_new()

.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>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221118224540.619276-418-uwe@kleine-koenig.org

diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index 8db15f5a7179ff993650b1559789decc95e6eacb..bdcedb034913eaa7bf120b2844082c5fee1f74aa 100644 (file)
--- a/drivers/mfd/adp5520.c
+++ b/drivers/mfd/adp5520.c
@@ -204,9 +204,9 @@ static int adp5520_remove_subdevs(struct adp5520_chip *chip)
        return device_for_each_child(chip->dev, NULL, __remove_subdev);
 }
 
-static int adp5520_probe(struct i2c_client *client,
-                                       const struct i2c_device_id *id)
+static int adp5520_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct adp5520_platform_data *pdata = dev_get_platdata(&client->dev);
        struct platform_device *pdev;
        struct adp5520_chip *chip;
@@ -342,7 +342,7 @@ static struct i2c_driver adp5520_driver = {
                .pm                     = &adp5520_pm,
                .suppress_bind_attrs    = true,
        },
-       .probe          = adp5520_probe,
+       .probe_new      = adp5520_probe,
        .id_table       = adp5520_id,
 };
 builtin_i2c_driver(adp5520_driver);