diff mbox series

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

Message ID 20221118224540.619276-418-uwe@kleine-koenig.org
State Not Applicable
Headers show
Series i2c: Complete conversion to i2c_probe_new | expand

Commit Message

Uwe Kleine-König Nov. 18, 2022, 10:42 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/mfd/adp5520.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:43
> 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>; Lee Jones <lee@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 417/606] mfd: adp5520: 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/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
diff mbox series

Patch

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