2022-11-19 01:14:25

by Uwe Kleine-König

Subject: [PATCH 539/606] regulator: ad5398: 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/regulator/ad5398.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c
index 75f432f61e91..2ba8ac1773d1 100644
--- a/drivers/regulator/ad5398.c
+++ b/drivers/regulator/ad5398.c
@@ -212,9 +212,9 @@ static const struct i2c_device_id ad5398_id[] = {
};
MODULE_DEVICE_TABLE(i2c, ad5398_id);

-static int ad5398_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int ad5398_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct regulator_init_data *init_data = dev_get_platdata(&client->dev);
struct regulator_config config = { };
struct ad5398_chip_info *chip;
@@ -254,7 +254,7 @@ static int ad5398_probe(struct i2c_client *client,
}

static struct i2c_driver ad5398_driver = {
- .probe = ad5398_probe,
+ .probe_new = ad5398_probe,
.driver = {
.name = "ad5398",
},
--
2.38.1

2022-11-21 10:35:51

by Hennerich, Michael

Subject: RE: [PATCH 539/606] regulator: ad5398: Convert to i2c's .probe_new()

> -----Original Message-----
> From: Uwe Kleine-König <[email protected]>
> Sent: Freitag, 18. November 2022 23:45
> To: Angel Iglesias <[email protected]>; Lee Jones
> <[email protected]>; Grant Likely <[email protected]>; Wolfram
> Sang <[email protected]>; Hennerich, Michael
> <[email protected]>; Liam Girdwood
> <[email protected]>; Mark Brown <[email protected]>
> Cc: [email protected]; [email protected]; Uwe Kleine-König
> <[email protected]>; [email protected]
> Subject: [PATCH 539/606] regulator: ad5398: 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/regulator/ad5398.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index
> 75f432f61e91..2ba8ac1773d1 100644
> --- a/drivers/regulator/ad5398.c
> +++ b/drivers/regulator/ad5398.c
> @@ -212,9 +212,9 @@ static const struct i2c_device_id ad5398_id[] = { };
> MODULE_DEVICE_TABLE(i2c, ad5398_id);
>
> -static int ad5398_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int ad5398_probe(struct i2c_client *client)
> {
> + const struct i2c_device_id *id = i2c_client_get_device_id(client);
> struct regulator_init_data *init_data = dev_get_platdata(&client-
> >dev);
> struct regulator_config config = { };
> struct ad5398_chip_info *chip;
> @@ -254,7 +254,7 @@ static int ad5398_probe(struct i2c_client *client, }
>
> static struct i2c_driver ad5398_driver = {
> - .probe = ad5398_probe,
> + .probe_new = ad5398_probe,
> .driver = {
> .name = "ad5398",
> },
> --
> 2.38.1