2022-11-19 00:41:50

by Uwe Kleine-König

Subject: [PATCH 417/606] mfd: adp5520: Convert to i2c's .probe_new()

From: Uwe Kleine-König <[email protected]>

.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 <[email protected]>
---
drivers/mfd/adp5520.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index 882eddc32f8e..cb168efdbafe 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;
@@ -340,7 +340,7 @@ static struct i2c_driver adp5520_driver = {
.pm = pm_sleep_ptr(&adp5520_pm),
.suppress_bind_attrs = true,
},
- .probe = adp5520_probe,
+ .probe_new = adp5520_probe,
.id_table = adp5520_id,
};
builtin_i2c_driver(adp5520_driver);
--
2.38.1

2022-11-21 10:09:59

by Hennerich, Michael

Subject: RE: [PATCH 417/606] mfd: adp5520: Convert to i2c's .probe_new()

> -----Original Message-----
> From: Uwe Kleine-König <[email protected]>
> Sent: Freitag, 18. November 2022 23:43
> To: Angel Iglesias <[email protected]>; Lee Jones
> <[email protected]>; Grant Likely <[email protected]>; Wolfram
> Sang <[email protected]>; Hennerich, Michael
> <[email protected]>; Lee Jones <[email protected]>
> Cc: [email protected]; [email protected]; Uwe Kleine-König
> <[email protected]>; [email protected]
> Subject: [PATCH 417/606] mfd: adp5520: Convert to i2c's .probe_new()
>
>
> From: Uwe Kleine-König <[email protected]>
>
> .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 <[email protected]>

Acked-by: Michael Hennerich <[email protected]>

> ---
> drivers/mfd/adp5520.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index
> 882eddc32f8e..cb168efdbafe 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;
> @@ -340,7 +340,7 @@ static struct i2c_driver adp5520_driver = {
> .pm = pm_sleep_ptr(&adp5520_pm),
> .suppress_bind_attrs = true,
> },
> - .probe = adp5520_probe,
> + .probe_new = adp5520_probe,
> .id_table = adp5520_id,
> };
> builtin_i2c_driver(adp5520_driver);
> --
> 2.38.1