From: Uwe Kleine-König Date: Fri, 18 Nov 2022 22:42:31 +0000 (+0100) Subject: mfd: adp5520: Convert to i2c's .probe_new() X-Git-Tag: v6.2-rc1~30^2~156 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48c2c36686125ff4a7ac6c6448dff31880ddd0df;p=thirdparty%2Flinux.git 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 Acked-by: Michael Hennerich Signed-off-by: Lee Jones 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 8db15f5a7179f..bdcedb034913e 100644 --- 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);