diff mbox series

drm/i2c: Switch i2c drivers back to use .probe()

Message ID 20230611202740.826120-1-u.kleine-koenig@pengutronix.de (mailing list archive)
State Accepted, archived
Headers show
Series drm/i2c: Switch i2c drivers back to use .probe() | expand

Commit Message

Uwe Kleine-König June 11, 2023, 8:27 p.m. UTC
After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
commit 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/gpu/drm/i2c/ch7006_drv.c | 2 +-
 drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


base-commit: 53ab6975c12d1ad86c599a8927e8c698b144d669

Comments

Javier Martinez Canillas June 11, 2023, 9:17 p.m. UTC | #1
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> writes:

Hello Uwe,

> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> call-back type"), all drivers being converted to .probe_new() and then
> commit 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>
> ---

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Andi Shyti June 11, 2023, 11:37 p.m. UTC | #2
Hi Uwe,

On Sun, Jun 11, 2023 at 10:27:40PM +0200, Uwe Kleine-König wrote:
> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> call-back type"), all drivers being converted to .probe_new() and then
> commit 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>

Reviewed-by: Andi Shyti <andi.shyti@kernel.org>

Andi
Uwe Kleine-König June 16, 2023, 5:58 a.m. UTC | #3
Hello,

On Sun, Jun 11, 2023 at 10:27:40PM +0200, Uwe Kleine-König wrote:
> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> call-back type"), all drivers being converted to .probe_new() and then
> commit 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.

It would be great if this patch made it into 6.5-rc1, as I intend to
send a patch series to Wolfram after the upcoming merge window to drop
.probe_new to go in via the i2c tree. There are a few remaining
driver instances that I will have to fix in this series, but I'm happy
about every patch that goes in via its designated tree beforehand.

Best regards
Uwe
Javier Martinez Canillas June 22, 2023, 10:09 a.m. UTC | #4
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> writes:

Hello Uwe,

> Hello,
>
> On Sun, Jun 11, 2023 at 10:27:40PM +0200, Uwe Kleine-König wrote:
>> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
>> call-back type"), all drivers being converted to .probe_new() and then
>> commit 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.
>
> It would be great if this patch made it into 6.5-rc1, as I intend to
> send a patch series to Wolfram after the upcoming merge window to drop
> .probe_new to go in via the i2c tree. There are a few remaining
> driver instances that I will have to fix in this series, but I'm happy
> about every patch that goes in via its designated tree beforehand.
>

Pushed to drm-misc (drm-misc-next). Thanks!

> Best regards
> Uwe
>
> -- 
> Pengutronix e.K.                           | Uwe Kleine-König            |
> Industrial Linux Solutions                 | https://www.pengutronix.de/ |
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 521bdf656cca..131512a5f3bd 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -497,7 +497,7 @@  static const struct dev_pm_ops ch7006_pm_ops = {
 
 static struct drm_i2c_encoder_driver ch7006_driver = {
 	.i2c_driver = {
-		.probe_new = ch7006_probe,
+		.probe = ch7006_probe,
 		.remove = ch7006_remove,
 
 		.driver = {
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c
index f57f9a807542..ff23422727fc 100644
--- a/drivers/gpu/drm/i2c/sil164_drv.c
+++ b/drivers/gpu/drm/i2c/sil164_drv.c
@@ -420,7 +420,7 @@  MODULE_DEVICE_TABLE(i2c, sil164_ids);
 
 static struct drm_i2c_encoder_driver sil164_driver = {
 	.i2c_driver = {
-		.probe_new = sil164_probe,
+		.probe = sil164_probe,
 		.driver = {
 			.name = "sil164",
 		},