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

Message ID 20221118224540.619276-540-uwe@kleine-koenig.org
State New
Headers
Series i2c: Complete conversion to i2c_probe_new |

Commit Message

Uwe Kleine-König Nov. 18, 2022, 10:44 p.m. UTC
  From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

.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>
---
 drivers/regulator/ad5398.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Hennerich, Michael Nov. 21, 2022, 9:46 a.m. UTC | #1
> -----Original Message-----
> From: Uwe Kleine-König <uwe@kleine-koenig.org>
> Sent: Freitag, 18. November 2022 23:45
> To: Angel Iglesias <ang.iglesiasg@gmail.com>; Lee Jones
> <lee.jones@linaro.org>; Grant Likely <grant.likely@linaro.org>; Wolfram
> Sang <wsa@kernel.org>; Hennerich, Michael
> <Michael.Hennerich@analog.com>; Liam Girdwood
> <lgirdwood@gmail.com>; Mark Brown <broonie@kernel.org>
> Cc: linux-i2c@vger.kernel.org; kernel@pengutronix.de; Uwe Kleine-König
> <u.kleine-koenig@pengutronix.de>; linux-kernel@vger.kernel.org
> Subject: [PATCH 539/606] regulator: ad5398: Convert to i2c's .probe_new()
> 
> 
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> .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>

> ---
>  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
  

Patch

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",
 	},