diff mbox series

auxdisplay: Switch i2c drivers back to use .probe()

Message ID 20230525205840.734432-1-u.kleine-koenig@pengutronix.de
State New
Headers
Series auxdisplay: Switch i2c drivers back to use .probe() |

Commit Message

Uwe Kleine-König May 25, 2023, 8:58 p.m. UTC 
  After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
convert back to (the new) .probe() to be able to eventually drop
.probe_new() from struct i2c_driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/auxdisplay/ht16k33.c | 2 +-
 drivers/auxdisplay/lcd2s.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


base-commit: ac9a78681b921877518763ba0e89202254349d1b

Comments

Miguel Ojeda May 26, 2023, 10:39 a.m. UTC | #1 
On Thu, May 25, 2023 at 10:58 PM Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
>
> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> call-back type"), all drivers being converted to .probe_new() and then
> 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
> convert back to (the new) .probe() to be able to eventually drop
> .probe_new() from struct i2c_driver.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Thanks for this! The conversion has taken a while given the date of
the first commit :)

The wording of the message was a bit confusing, perhaps a ";
finally/now" before "convert" would have helped, but no big deal.

If somebody is taking all the patches treewide, then:

    Acked-by: Miguel Ojeda <ojeda@kernel.org>

Otherwise, I will queue it.

Thanks!

Cheers,
Miguel
Uwe Kleine-König May 26, 2023, 12:59 p.m. UTC | #2 
hello Miguel,

On Fri, May 26, 2023 at 12:39:55PM +0200, Miguel Ojeda wrote:
> On Thu, May 25, 2023 at 10:58 PM Uwe Kleine-König
> <u.kleine-koenig@pengutronix.de> wrote:
> >
> > After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> > call-back type"), all drivers being converted to .probe_new() and then
> > 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
> > convert back to (the new) .probe() to be able to eventually drop
> > .probe_new() from struct i2c_driver.
> >
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Thanks for this! The conversion has taken a while given the date of
> the first commit :)
> 
> The wording of the message was a bit confusing, perhaps a ";
> finally/now" before "convert" would have helped, but no big deal.
> 
> If somebody is taking all the patches treewide, then:
> 
>     Acked-by: Miguel Ojeda <ojeda@kernel.org>
> 
> Otherwise, I will queue it.

The overall idea was to make the changes in a way to require no
coordination between maintainers. So adding this change to your tree
would be great.

Thanks
Uwe
Miguel Ojeda June 2, 2023, 11:27 a.m. UTC | #3 
On Fri, May 26, 2023 at 3:00 PM Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
>
> The overall idea was to make the changes in a way to require no
> coordination between maintainers. So adding this change to your tree
> would be great.

Sounds good -- applied to `auxdisplay`, thanks!

Cheers,
Miguel
diff mbox series

Patch

diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c
index 02425991c159..d44814b9562a 100644
--- a/drivers/auxdisplay/ht16k33.c
+++ b/drivers/auxdisplay/ht16k33.c
@@ -820,7 +820,7 @@  static const struct of_device_id ht16k33_of_match[] = {
 MODULE_DEVICE_TABLE(of, ht16k33_of_match);
 
 static struct i2c_driver ht16k33_driver = {
-	.probe_new	= ht16k33_probe,
+	.probe		= ht16k33_probe,
 	.remove		= ht16k33_remove,
 	.driver		= {
 		.name		= DRIVER_NAME,
diff --git a/drivers/auxdisplay/lcd2s.c b/drivers/auxdisplay/lcd2s.c
index 135831a16514..6422be0dfe20 100644
--- a/drivers/auxdisplay/lcd2s.c
+++ b/drivers/auxdisplay/lcd2s.c
@@ -365,7 +365,7 @@  static struct i2c_driver lcd2s_i2c_driver = {
 		.name = "lcd2s",
 		.of_match_table = lcd2s_of_table,
 	},
-	.probe_new = lcd2s_i2c_probe,
+	.probe = lcd2s_i2c_probe,
 	.remove = lcd2s_i2c_remove,
 	.id_table = lcd2s_i2c_id,
 };