diff mbox series

backlight: ktz8866: Convert to i2c's .probe_new()

Message ID 20230127152639.1347229-1-u.kleine-koenig@pengutronix.de (mailing list archive)
State Handled Elsewhere
Headers show
Series backlight: ktz8866: Convert to i2c's .probe_new() | expand

Commit Message

Uwe Kleine-König Jan. 27, 2023, 3:26 p.m. UTC
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>
---
Hello,

there is an ongoing effort to convert all drivers to .probe_new to
eventually drop .probe with the i2c_device_id parameter. This driver
currently sits in next so wasn't on my radar before.

My plan is to tackle that after the next merge window. So I ask you to
either apply this patch during the next merge window or accept that it
will go in via the i2c tree together with the patch that drops .probe().

Best regards
Uwe

 drivers/video/backlight/ktz8866.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


base-commit: 2241ab53cbb5cdb08a6b2d4688feb13971058f65
prerequisite-patch-id: 2e7d7db8c0a90b8cd1deb6bbc51ead4c89c89b62

Comments

Jianhua Lu Jan. 28, 2023, 12:36 a.m. UTC | #1
On Fri, Jan 27, 2023 at 04:26:39PM +0100, Uwe Kleine-König wrote:
> 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>
> ---
> Hello,
> 
> there is an ongoing effort to convert all drivers to .probe_new to
> eventually drop .probe with the i2c_device_id parameter. This driver
> currently sits in next so wasn't on my radar before.
> 
> My plan is to tackle that after the next merge window. So I ask you to
> either apply this patch during the next merge window or accept that it
> will go in via the i2c tree together with the patch that drops .probe().
> 
> Best regards
> Uwe
> 
>  drivers/video/backlight/ktz8866.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/video/backlight/ktz8866.c b/drivers/video/backlight/ktz8866.c
> index 97b723719e13..d38c13ad39c7 100644
> --- a/drivers/video/backlight/ktz8866.c
> +++ b/drivers/video/backlight/ktz8866.c
> @@ -124,8 +124,7 @@ static void ktz8866_init(struct ktz8866 *ktz)
>  		ktz8866_write(ktz, LCD_BIAS_CFG1, LCD_BIAS_EN);
>  }
>  
> -static int ktz8866_probe(struct i2c_client *client,
> -			 const struct i2c_device_id *id)
> +static int ktz8866_probe(struct i2c_client *client)
>  {
>  	struct backlight_device *backlight_dev;
>  	struct backlight_properties props;
> @@ -197,7 +196,7 @@ static struct i2c_driver ktz8866_driver = {
>  		.name = "ktz8866",
>  		.of_match_table = ktz8866_match_table,
>  	},
> -	.probe = ktz8866_probe,
> +	.probe_new = ktz8866_probe,
I think .probe_new() will be renamed to new .probe() again when there are
patches dropping old .probe(). I prefer that you pack this commit to the
i2c-tree commit that drops old .probe(). 
>  	.remove = ktz8866_remove,
>  	.id_table = ktz8866_ids,
>  };
> 
> base-commit: 2241ab53cbb5cdb08a6b2d4688feb13971058f65
> prerequisite-patch-id: 2e7d7db8c0a90b8cd1deb6bbc51ead4c89c89b62
> -- 
> 2.39.0
>
Uwe Kleine-König Jan. 28, 2023, 1:32 p.m. UTC | #2
Hello,

On Sat, Jan 28, 2023 at 08:36:28AM +0800, Jianhua Lu wrote:
> On Fri, Jan 27, 2023 at 04:26:39PM +0100, Uwe Kleine-König wrote:
> > 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>
> > ---
> > Hello,
> > 
> > there is an ongoing effort to convert all drivers to .probe_new to
> > eventually drop .probe with the i2c_device_id parameter. This driver
> > currently sits in next so wasn't on my radar before.
> > 
> > My plan is to tackle that after the next merge window. So I ask you to
> > either apply this patch during the next merge window or accept that it
> > will go in via the i2c tree together with the patch that drops .probe().
> > 
> > Best regards
> > Uwe
> > 
> >  drivers/video/backlight/ktz8866.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/video/backlight/ktz8866.c b/drivers/video/backlight/ktz8866.c
> > index 97b723719e13..d38c13ad39c7 100644
> > --- a/drivers/video/backlight/ktz8866.c
> > +++ b/drivers/video/backlight/ktz8866.c
> > @@ -124,8 +124,7 @@ static void ktz8866_init(struct ktz8866 *ktz)
> >  		ktz8866_write(ktz, LCD_BIAS_CFG1, LCD_BIAS_EN);
> >  }
> >  
> > -static int ktz8866_probe(struct i2c_client *client,
> > -			 const struct i2c_device_id *id)
> > +static int ktz8866_probe(struct i2c_client *client)
> >  {
> >  	struct backlight_device *backlight_dev;
> >  	struct backlight_properties props;
> > @@ -197,7 +196,7 @@ static struct i2c_driver ktz8866_driver = {
> >  		.name = "ktz8866",
> >  		.of_match_table = ktz8866_match_table,
> >  	},
> > -	.probe = ktz8866_probe,
> > +	.probe_new = ktz8866_probe,
> 
> I think .probe_new() will be renamed to new .probe() again when there are
> patches dropping old .probe().

Right, the plan is to reintroduce .probe with the prototype that
.probe_new has today.

> I prefer that you pack this commit to the i2c-tree commit that drops
> old .probe(). 

That's fine for me. Can I interpret this as an Ack for this patch?

Best regards
Uwe
Jianhua Lu Jan. 28, 2023, 2:14 p.m. UTC | #3
On Sat, Jan 28, 2023 at 02:32:39PM +0100, Uwe Kleine-König wrote:
> Hello,
> 
> On Sat, Jan 28, 2023 at 08:36:28AM +0800, Jianhua Lu wrote:
> > On Fri, Jan 27, 2023 at 04:26:39PM +0100, Uwe Kleine-König wrote:
> > > 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>
> > > ---
> > > Hello,
> > > 
> > > there is an ongoing effort to convert all drivers to .probe_new to
> > > eventually drop .probe with the i2c_device_id parameter. This driver
> > > currently sits in next so wasn't on my radar before.
> > > 
> > > My plan is to tackle that after the next merge window. So I ask you to
> > > either apply this patch during the next merge window or accept that it
> > > will go in via the i2c tree together with the patch that drops .probe().
> > > 
> > > Best regards
> > > Uwe
> > > 
> > >  drivers/video/backlight/ktz8866.c | 5 ++---
> > >  1 file changed, 2 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/video/backlight/ktz8866.c b/drivers/video/backlight/ktz8866.c
> > > index 97b723719e13..d38c13ad39c7 100644
> > > --- a/drivers/video/backlight/ktz8866.c
> > > +++ b/drivers/video/backlight/ktz8866.c
> > > @@ -124,8 +124,7 @@ static void ktz8866_init(struct ktz8866 *ktz)
> > >  		ktz8866_write(ktz, LCD_BIAS_CFG1, LCD_BIAS_EN);
> > >  }
> > >  
> > > -static int ktz8866_probe(struct i2c_client *client,
> > > -			 const struct i2c_device_id *id)
> > > +static int ktz8866_probe(struct i2c_client *client)
> > >  {
> > >  	struct backlight_device *backlight_dev;
> > >  	struct backlight_properties props;
> > > @@ -197,7 +196,7 @@ static struct i2c_driver ktz8866_driver = {
> > >  		.name = "ktz8866",
> > >  		.of_match_table = ktz8866_match_table,
> > >  	},
> > > -	.probe = ktz8866_probe,
> > > +	.probe_new = ktz8866_probe,
> > 
> > I think .probe_new() will be renamed to new .probe() again when there are
> > patches dropping old .probe().
> 
> Right, the plan is to reintroduce .probe with the prototype that
> .probe_new has today.
> 
> > I prefer that you pack this commit to the i2c-tree commit that drops
> > old .probe(). 
> 
> That's fine for me. Can I interpret this as an Ack for this patch?
Yes, but can't get my A-b directly, this patch should be ignored and 
resend it within the i2c-tree patch series or split it to two patch
series.
> 
> Best regards
> Uwe
> 
> -- 
> Pengutronix e.K.                           | Uwe Kleine-König            |
> Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Uwe Kleine-König Jan. 28, 2023, 4:16 p.m. UTC | #4
Hello,

On Sat, Jan 28, 2023 at 10:14:09PM +0800, Jianhua Lu wrote:
> On Sat, Jan 28, 2023 at 02:32:39PM +0100, Uwe Kleine-König wrote:
> > On Sat, Jan 28, 2023 at 08:36:28AM +0800, Jianhua Lu wrote:
> > > I prefer that you pack this commit to the i2c-tree commit that drops
> > > old .probe(). 
> > 
> > That's fine for me. Can I interpret this as an Ack for this patch?
> 
> Yes, but can't get my A-b directly, this patch should be ignored and 
> resend it within the i2c-tree patch series or split it to two patch
> series.

I'm not sure if I understand you correctly. Up to know I though you want
the patch as is go in together with the patch that modifies struct
i2c_driver such that the PR has in two separate commits:

	i2c: Modify .probe() to not take an id parameter
	backlight: ktz8866: Convert to i2c's .probe_new()

Did I understand that right?

In that case an Ack by you would be fine and welcome.

I don't want to squash the changes to the ktz8866 driver into the patch
that modifies struct i2c_driver, as this needlessly clutters the commit,
if it's that what you wanted. (There are more than 1000 i2c drivers and
the others are not converted in a single lockstep, too.)

Best regards
Uwe
Jianhua Lu Jan. 28, 2023, 4:44 p.m. UTC | #5
On Sat, Jan 28, 2023 at 05:16:13PM +0100, Uwe Kleine-König wrote:
> Hello,
> 
> On Sat, Jan 28, 2023 at 10:14:09PM +0800, Jianhua Lu wrote:
> > On Sat, Jan 28, 2023 at 02:32:39PM +0100, Uwe Kleine-König wrote:
> > > On Sat, Jan 28, 2023 at 08:36:28AM +0800, Jianhua Lu wrote:
> > > > I prefer that you pack this commit to the i2c-tree commit that drops
> > > > old .probe(). 
> > > 
> > > That's fine for me. Can I interpret this as an Ack for this patch?
> > 
> > Yes, but can't get my A-b directly, this patch should be ignored and 
> > resend it within the i2c-tree patch series or split it to two patch
> > series.
> 
> I'm not sure if I understand you correctly. Up to know I though you want
> the patch as is go in together with the patch that modifies struct
> i2c_driver such that the PR has in two separate commits:
> 
> 	i2c: Modify .probe() to not take an id parameter
> 	backlight: ktz8866: Convert to i2c's .probe_new()
This is case 1, the case 2 should be:
	Patch 1: i2c: Modify .probe() to not take an id parameter
	Patch 2: backlight: ktz8866: Convert to i2c's .probe_new()
					 'subsystem': 'i2c driver name': Convert to i2c's .probe_new()
					 ...
> 
> Did I understand that right?
> 
> In that case an Ack by you would be fine and welcome.
> 
> I don't want to squash the changes to the ktz8866 driver into the patch
> that modifies struct i2c_driver, as this needlessly clutters the commit,
> if it's that what you wanted. (There are more than 1000 i2c drivers and
> the others are not converted in a single lockstep, too.)
Do't squash this patch, I'd like you send a series patch instead of
a single patch.
> 
> Best regards
> Uwe
> 
> -- 
> Pengutronix e.K.                           | Uwe Kleine-König            |
> Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Uwe Kleine-König Jan. 28, 2023, 5:07 p.m. UTC | #6
Hello,

On Sun, Jan 29, 2023 at 12:44:30AM +0800, Jianhua Lu wrote:
> On Sat, Jan 28, 2023 at 05:16:13PM +0100, Uwe Kleine-König wrote:
> > I don't want to squash the changes to the ktz8866 driver into the patch
> > that modifies struct i2c_driver, as this needlessly clutters the commit,
> > if it's that what you wanted. (There are more than 1000 i2c drivers and
> > the others are not converted in a single lockstep, too.)
> 
> Do't squash this patch, I'd like you send a series patch instead of
> a single patch.

This series was already sent before. However that happend based on a
tree that didn't contain the ktz8866 backlight driver, so this patch
came later (and I didn't resend the whole series for the two drivers
that were added since then :-). See
https://lore.kernel.org/lkml/20221118224540.619276-1-uwe@kleine-koenig.org.
for the original post.

Letting this patch go in via the i2c tree together with the commit
changing i2c_driver is fine for me, it won't be the only one.

Best regards
Uwe
Jianhua Lu Jan. 28, 2023, 5:35 p.m. UTC | #7
On Sat, Jan 28, 2023 at 06:07:08PM +0100, Uwe Kleine-König wrote:
> Hello,
> 
> On Sun, Jan 29, 2023 at 12:44:30AM +0800, Jianhua Lu wrote:
> > On Sat, Jan 28, 2023 at 05:16:13PM +0100, Uwe Kleine-König wrote:
> > > I don't want to squash the changes to the ktz8866 driver into the patch
> > > that modifies struct i2c_driver, as this needlessly clutters the commit,
> > > if it's that what you wanted. (There are more than 1000 i2c drivers and
> > > the others are not converted in a single lockstep, too.)
> > 
> > Do't squash this patch, I'd like you send a series patch instead of
> > a single patch.
> 
> This series was already sent before. However that happend based on a
> tree that didn't contain the ktz8866 backlight driver, so this patch
> came later (and I didn't resend the whole series for the two drivers
> that were added since then :-). See
> https://lore.kernel.org/lkml/20221118224540.619276-1-uwe@kleine-koenig.org.
> for the original post.
Thanks for explanation.
> 
> Letting this patch go in via the i2c tree together with the commit
> changing i2c_driver is fine for me, it won't be the only one.
I think so too.
> 
> Best regards
> Uwe
> 
> -- 
> Pengutronix e.K.                           | Uwe Kleine-König            |
> Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Lee Jones Jan. 30, 2023, 9:42 a.m. UTC | #8
On Fri, 27 Jan 2023, Uwe Kleine-König wrote:

> 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>
> ---
> Hello,
> 
> there is an ongoing effort to convert all drivers to .probe_new to
> eventually drop .probe with the i2c_device_id parameter. This driver
> currently sits in next so wasn't on my radar before.
> 
> My plan is to tackle that after the next merge window. So I ask you to
> either apply this patch during the next merge window or accept that it
> will go in via the i2c tree together with the patch that drops .probe().
> 
>  drivers/video/backlight/ktz8866.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Applied, thanks
Uwe Kleine-König Feb. 11, 2023, 11:05 p.m. UTC | #9
Hello Lee,

On Mon, Jan 30, 2023 at 09:42:01AM +0000, Lee Jones wrote:
> On Fri, 27 Jan 2023, Uwe Kleine-König wrote:
> 
> > 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>
> > ---
> > Hello,
> > 
> > there is an ongoing effort to convert all drivers to .probe_new to
> > eventually drop .probe with the i2c_device_id parameter. This driver
> > currently sits in next so wasn't on my radar before.
> > 
> > My plan is to tackle that after the next merge window. So I ask you to
> > either apply this patch during the next merge window or accept that it
> > will go in via the i2c tree together with the patch that drops .probe().
> > 
> >  drivers/video/backlight/ktz8866.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> Applied, thanks

Thanks, this patch didn't make it into next yet though. Is there a
problem other than pending tests before you publish it in your tree that
gets pulled into next?

Best regards
Uwe
Lee Jones Feb. 22, 2023, 3:23 p.m. UTC | #10
On Sun, 12 Feb 2023, Uwe Kleine-König wrote:

> Hello Lee,
> 
> On Mon, Jan 30, 2023 at 09:42:01AM +0000, Lee Jones wrote:
> > On Fri, 27 Jan 2023, Uwe Kleine-König wrote:
> > 
> > > 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>
> > > ---
> > > Hello,
> > > 
> > > there is an ongoing effort to convert all drivers to .probe_new to
> > > eventually drop .probe with the i2c_device_id parameter. This driver
> > > currently sits in next so wasn't on my radar before.
> > > 
> > > My plan is to tackle that after the next merge window. So I ask you to
> > > either apply this patch during the next merge window or accept that it
> > > will go in via the i2c tree together with the patch that drops .probe().
> > > 
> > >  drivers/video/backlight/ktz8866.c | 5 ++---
> > >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > Applied, thanks
> 
> Thanks, this patch didn't make it into next yet though. Is there a
> problem other than pending tests before you publish it in your tree that
> gets pulled into next?

It's queued, ready to be submitted tomorrow.  Don't worry.
diff mbox series

Patch

diff --git a/drivers/video/backlight/ktz8866.c b/drivers/video/backlight/ktz8866.c
index 97b723719e13..d38c13ad39c7 100644
--- a/drivers/video/backlight/ktz8866.c
+++ b/drivers/video/backlight/ktz8866.c
@@ -124,8 +124,7 @@  static void ktz8866_init(struct ktz8866 *ktz)
 		ktz8866_write(ktz, LCD_BIAS_CFG1, LCD_BIAS_EN);
 }
 
-static int ktz8866_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
+static int ktz8866_probe(struct i2c_client *client)
 {
 	struct backlight_device *backlight_dev;
 	struct backlight_properties props;
@@ -197,7 +196,7 @@  static struct i2c_driver ktz8866_driver = {
 		.name = "ktz8866",
 		.of_match_table = ktz8866_match_table,
 	},
-	.probe = ktz8866_probe,
+	.probe_new = ktz8866_probe,
 	.remove = ktz8866_remove,
 	.id_table = ktz8866_ids,
 };