[585/606] backlight: adp8860: Convert to i2c's .probe_new()

Message ID 20221118224540.619276-586-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:45 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/video/backlight/adp8860_bl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Hennerich, Michael Nov. 21, 2022, 9:45 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>; Lee Jones <lee@kernel.org>; Daniel
> Thompson <daniel.thompson@linaro.org>; Jingoo Han
> <jingoohan1@gmail.com>; Helge Deller <deller@gmx.de>
> Cc: linux-i2c@vger.kernel.org; kernel@pengutronix.de; Uwe Kleine-König
> <u.kleine-koenig@pengutronix.de>; dri-devel@lists.freedesktop.org; linux-
> fbdev@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH 585/606] backlight: adp8860: 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/video/backlight/adp8860_bl.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/video/backlight/adp8860_bl.c
> b/drivers/video/backlight/adp8860_bl.c
> index b0fe02273e87..a479aab90f78 100644
> --- a/drivers/video/backlight/adp8860_bl.c
> +++ b/drivers/video/backlight/adp8860_bl.c
> @@ -648,9 +648,9 @@ static const struct attribute_group
> adp8860_bl_attr_group = {
>  	.attrs = adp8860_bl_attributes,
>  };
> 
> -static int adp8860_probe(struct i2c_client *client,
> -					const struct i2c_device_id *id)
> +static int adp8860_probe(struct i2c_client *client)
>  {
> +	const struct i2c_device_id *id = i2c_client_get_device_id(client);
>  	struct backlight_device *bl;
>  	struct adp8860_bl *data;
>  	struct adp8860_backlight_platform_data *pdata = @@ -803,7 +803,7
> @@ static struct i2c_driver adp8860_driver = {
>  		.name	= KBUILD_MODNAME,
>  		.pm	= &adp8860_i2c_pm_ops,
>  	},
> -	.probe    = adp8860_probe,
> +	.probe_new = adp8860_probe,
>  	.remove   = adp8860_remove,
>  	.id_table = adp8860_id,
>  };
> --
> 2.38.1
  
Daniel Thompson Nov. 21, 2022, 10:14 a.m. UTC | #2
On Fri, Nov 18, 2022 at 11:45:19PM +0100, Uwe Kleine-König wrote:
> 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>

Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>


Daniel.
  

Patch

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index b0fe02273e87..a479aab90f78 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -648,9 +648,9 @@  static const struct attribute_group adp8860_bl_attr_group = {
 	.attrs = adp8860_bl_attributes,
 };
 
-static int adp8860_probe(struct i2c_client *client,
-					const struct i2c_device_id *id)
+static int adp8860_probe(struct i2c_client *client)
 {
+	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct backlight_device *bl;
 	struct adp8860_bl *data;
 	struct adp8860_backlight_platform_data *pdata =
@@ -803,7 +803,7 @@  static struct i2c_driver adp8860_driver = {
 		.name	= KBUILD_MODNAME,
 		.pm	= &adp8860_i2c_pm_ops,
 	},
-	.probe    = adp8860_probe,
+	.probe_new = adp8860_probe,
 	.remove   = adp8860_remove,
 	.id_table = adp8860_id,
 };