[513/606] power: supply: adp5061: Convert to i2c's .probe_new()

Message ID 20221118224540.619276-514-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>

The probe function doesn't make use of the i2c_device_id * parameter so it
can be trivially converted.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/power/supply/adp5061.c | 5 ++---
 1 file changed, 2 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:44
> 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>; Sebastian Reichel <sre@kernel.org>
> Cc: linux-i2c@vger.kernel.org; kernel@pengutronix.de; Uwe Kleine-König
> <u.kleine-koenig@pengutronix.de>; linux-pm@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Subject: [PATCH 513/606] power: supply: adp5061: Convert to i2c's
> .probe_new()
> 
> 
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> The probe function doesn't make use of the i2c_device_id * parameter so it
> can be trivially converted.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Acked-by: Michael Hennerich <michael.hennerich@analog.com>

> ---
>  drivers/power/supply/adp5061.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/power/supply/adp5061.c
> b/drivers/power/supply/adp5061.c index fcf8ff0bc974..840db629a46c
> 100644
> --- a/drivers/power/supply/adp5061.c
> +++ b/drivers/power/supply/adp5061.c
> @@ -694,8 +694,7 @@ static const struct power_supply_desc adp5061_desc
> = {
>  	.num_properties		= ARRAY_SIZE(adp5061_props),
>  };
> 
> -static int adp5061_probe(struct i2c_client *client,
> -			 const struct i2c_device_id *id)
> +static int adp5061_probe(struct i2c_client *client)
>  {
>  	struct power_supply_config psy_cfg = {};
>  	struct adp5061_state *st;
> @@ -737,7 +736,7 @@ static struct i2c_driver adp5061_driver = {
>  	.driver = {
>  		.name = KBUILD_MODNAME,
>  	},
> -	.probe = adp5061_probe,
> +	.probe_new = adp5061_probe,
>  	.id_table = adp5061_id,
>  };
>  module_i2c_driver(adp5061_driver);
> --
> 2.38.1
  

Patch

diff --git a/drivers/power/supply/adp5061.c b/drivers/power/supply/adp5061.c
index fcf8ff0bc974..840db629a46c 100644
--- a/drivers/power/supply/adp5061.c
+++ b/drivers/power/supply/adp5061.c
@@ -694,8 +694,7 @@  static const struct power_supply_desc adp5061_desc = {
 	.num_properties		= ARRAY_SIZE(adp5061_props),
 };
 
-static int adp5061_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
+static int adp5061_probe(struct i2c_client *client)
 {
 	struct power_supply_config psy_cfg = {};
 	struct adp5061_state *st;
@@ -737,7 +736,7 @@  static struct i2c_driver adp5061_driver = {
 	.driver = {
 		.name = KBUILD_MODNAME,
 	},
-	.probe = adp5061_probe,
+	.probe_new = adp5061_probe,
 	.id_table = adp5061_id,
 };
 module_i2c_driver(adp5061_driver);