[v2] drm: Switch i2c drivers back to use .probe()

Commit Message

Uwe Kleine-König May 26, 2023, 9:07 a.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 <[e-mail]>
---
Hello,

I didn't get feedback for (implicit) v1 that was sent with Message-Id:
<[e-mail]>. This is a
rebase on v6.4-rc1 as the former patch doesn't apply cleanly any more.

I also added more people to Cc, maybe that helps to get feedback.

This patch is based on v6.4-rc1, and applies fine on today's next.
(There are also no new drivers that need adaption in next.)

Thanks for considering,
Uwe

 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c             | 2 +-
 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c       | 2 +-
 drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c       | 2 +-
 drivers/gpu/drm/bridge/analogix/anx7625.c                | 2 +-
 drivers/gpu/drm/bridge/chipone-icn6211.c                 | 2 +-
 drivers/gpu/drm/bridge/chrontel-ch7033.c                 | 2 +-
 drivers/gpu/drm/bridge/cros-ec-anx7688.c                 | 2 +-
 drivers/gpu/drm/bridge/ite-it6505.c                      | 2 +-
 drivers/gpu/drm/bridge/ite-it66121.c                     | 2 +-
 drivers/gpu/drm/bridge/lontium-lt8912b.c                 | 2 +-
 drivers/gpu/drm/bridge/lontium-lt9211.c                  | 2 +-
 drivers/gpu/drm/bridge/lontium-lt9611.c                  | 2 +-
 drivers/gpu/drm/bridge/lontium-lt9611uxc.c               | 2 +-
 drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 ++--
 drivers/gpu/drm/bridge/nxp-ptn3460.c                     | 2 +-
 drivers/gpu/drm/bridge/parade-ps8622.c                   | 2 +-
 drivers/gpu/drm/bridge/parade-ps8640.c                   | 2 +-
 drivers/gpu/drm/bridge/sii902x.c                         | 2 +-
 drivers/gpu/drm/bridge/sii9234.c                         | 2 +-
 drivers/gpu/drm/bridge/sil-sii8620.c                     | 2 +-
 drivers/gpu/drm/bridge/tc358767.c                        | 2 +-
 drivers/gpu/drm/bridge/tc358768.c                        | 2 +-
 drivers/gpu/drm/bridge/tc358775.c                        | 2 +-
 drivers/gpu/drm/bridge/ti-dlpc3433.c                     | 2 +-
 drivers/gpu/drm/bridge/ti-sn65dsi83.c                    | 2 +-
 drivers/gpu/drm/bridge/ti-sn65dsi86.c                    | 2 +-
 drivers/gpu/drm/bridge/ti-tfp410.c                       | 2 +-
 drivers/gpu/drm/i2c/tda9950.c                            | 2 +-
 drivers/gpu/drm/i2c/tda998x_drv.c                        | 2 +-
 drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c       | 2 +-
 drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c    | 2 +-
 drivers/gpu/drm/solomon/ssd130x-i2c.c                    | 2 +-
 32 files changed, 33 insertions(+), 33 deletions(-)


base-commit: ac9a78681b921877518763ba0e89202254349d1b

Comments

Kieran Bingham May 26, 2023, 9:48 a.m. UTC | #1

Quoting Uwe Kleine-König (2023-05-26 10:07:09)
> 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 <[e-mail]>
> ---
> Hello,
> 
> I didn't get feedback for (implicit) v1 that was sent with Message-Id:
> <[e-mail]>. This is a
> rebase on v6.4-rc1 as the former patch doesn't apply cleanly any more.
> 
> I also added more people to Cc, maybe that helps to get feedback.

Having been invovled in b8a1a4cd5a98 ("i2c: Provide a temporary
.probe_new() call-back type") and definitley expected 'temporary' to
mean less than 7 years, I very much approve of this patchset.

Thank you for all your efforts Uwe.

Reviewed-by: Kieran Bingham <[e-mail]>

> This patch is based on v6.4-rc1, and applies fine on today's next.
> (There are also no new drivers that need adaption in next.)
> 
> Thanks for considering,
> Uwe
> 
>  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c             | 2 +-
>  drivers/gpu/drm/bridge/analogix/analogix-anx6345.c       | 2 +-
>  drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c       | 2 +-
>  drivers/gpu/drm/bridge/analogix/anx7625.c                | 2 +-
>  drivers/gpu/drm/bridge/chipone-icn6211.c                 | 2 +-
>  drivers/gpu/drm/bridge/chrontel-ch7033.c                 | 2 +-
>  drivers/gpu/drm/bridge/cros-ec-anx7688.c                 | 2 +-
>  drivers/gpu/drm/bridge/ite-it6505.c                      | 2 +-
>  drivers/gpu/drm/bridge/ite-it66121.c                     | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt8912b.c                 | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9211.c                  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611.c                  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611uxc.c               | 2 +-
>  drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 ++--
>  drivers/gpu/drm/bridge/nxp-ptn3460.c                     | 2 +-
>  drivers/gpu/drm/bridge/parade-ps8622.c                   | 2 +-
>  drivers/gpu/drm/bridge/parade-ps8640.c                   | 2 +-
>  drivers/gpu/drm/bridge/sii902x.c                         | 2 +-
>  drivers/gpu/drm/bridge/sii9234.c                         | 2 +-
>  drivers/gpu/drm/bridge/sil-sii8620.c                     | 2 +-
>  drivers/gpu/drm/bridge/tc358767.c                        | 2 +-
>  drivers/gpu/drm/bridge/tc358768.c                        | 2 +-
>  drivers/gpu/drm/bridge/tc358775.c                        | 2 +-
>  drivers/gpu/drm/bridge/ti-dlpc3433.c                     | 2 +-
>  drivers/gpu/drm/bridge/ti-sn65dsi83.c                    | 2 +-
>  drivers/gpu/drm/bridge/ti-sn65dsi86.c                    | 2 +-
>  drivers/gpu/drm/bridge/ti-tfp410.c                       | 2 +-
>  drivers/gpu/drm/i2c/tda9950.c                            | 2 +-
>  drivers/gpu/drm/i2c/tda998x_drv.c                        | 2 +-
>  drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c       | 2 +-
>  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c    | 2 +-
>  drivers/gpu/drm/solomon/ssd130x-i2c.c                    | 2 +-
>  32 files changed, 33 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index ddceafa7b637..2254457ab5d0 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -1393,7 +1393,7 @@ static struct i2c_driver adv7511_driver = {
>                 .of_match_table = adv7511_of_ids,
>         },
>         .id_table = adv7511_i2c_ids,
> -       .probe_new = adv7511_probe,
> +       .probe = adv7511_probe,
>         .remove = adv7511_remove,
>  };
>  
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> index 3577c532abb4..72ab2ab77081 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> @@ -815,7 +815,7 @@ static struct i2c_driver anx6345_driver = {
>                    .name = "anx6345",
>                    .of_match_table = of_match_ptr(anx6345_match_table),
>                   },
> -       .probe_new = anx6345_i2c_probe,
> +       .probe = anx6345_i2c_probe,
>         .remove = anx6345_i2c_remove,
>         .id_table = anx6345_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> index a3a38bbe2786..06a3e3243e19 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> @@ -1389,7 +1389,7 @@ static struct i2c_driver anx78xx_driver = {
>                    .name = "anx7814",
>                    .of_match_table = of_match_ptr(anx78xx_match_table),
>                   },
> -       .probe_new = anx78xx_i2c_probe,
> +       .probe = anx78xx_i2c_probe,
>         .remove = anx78xx_i2c_remove,
>         .id_table = anx78xx_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 6846199a2ee1..0a97364ba8ea 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -2753,7 +2753,7 @@ static struct i2c_driver anx7625_driver = {
>                 .of_match_table = anx_match_table,
>                 .pm = &anx7625_pm_ops,
>         },
> -       .probe_new = anx7625_i2c_probe,
> +       .probe = anx7625_i2c_probe,
>         .remove = anx7625_i2c_remove,
>  
>         .id_table = anx7625_id,
> diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
> index 0e37840cd7a8..8bfce21d6b90 100644
> --- a/drivers/gpu/drm/bridge/chipone-icn6211.c
> +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c
> @@ -795,7 +795,7 @@ static struct i2c_device_id chipone_i2c_id[] = {
>  MODULE_DEVICE_TABLE(i2c, chipone_i2c_id);
>  
>  static struct i2c_driver chipone_i2c_driver = {
> -       .probe_new = chipone_i2c_probe,
> +       .probe = chipone_i2c_probe,
>         .id_table = chipone_i2c_id,
>         .driver = {
>                 .name = "chipone-icn6211-i2c",
> diff --git a/drivers/gpu/drm/bridge/chrontel-ch7033.c b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> index 339b759e4c81..a854eb84e399 100644
> --- a/drivers/gpu/drm/bridge/chrontel-ch7033.c
> +++ b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> @@ -603,7 +603,7 @@ static const struct i2c_device_id ch7033_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, ch7033_ids);
>  
>  static struct i2c_driver ch7033_driver = {
> -       .probe_new = ch7033_probe,
> +       .probe = ch7033_probe,
>         .remove = ch7033_remove,
>         .driver = {
>                 .name = "ch7033",
> diff --git a/drivers/gpu/drm/bridge/cros-ec-anx7688.c b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> index fa91bdeddef0..c8abd9920fee 100644
> --- a/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> +++ b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> @@ -173,7 +173,7 @@ static const struct of_device_id cros_ec_anx7688_bridge_match_table[] = {
>  MODULE_DEVICE_TABLE(of, cros_ec_anx7688_bridge_match_table);
>  
>  static struct i2c_driver cros_ec_anx7688_bridge_driver = {
> -       .probe_new = cros_ec_anx7688_bridge_probe,
> +       .probe = cros_ec_anx7688_bridge_probe,
>         .remove = cros_ec_anx7688_bridge_remove,
>         .driver = {
>                 .name = "cros-ec-anx7688-bridge",
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
> index abaf6e23775e..a4cc51cf6e06 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -3478,7 +3478,7 @@ static struct i2c_driver it6505_i2c_driver = {
>                 .of_match_table = it6505_of_match,
>                 .pm = &it6505_bridge_pm_ops,
>         },
> -       .probe_new = it6505_i2c_probe,
> +       .probe = it6505_i2c_probe,
>         .remove = it6505_i2c_remove,
>         .shutdown = it6505_shutdown,
>         .id_table = it6505_id,
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index a2d723d6a4be..466641c77fe9 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -1640,7 +1640,7 @@ static struct i2c_driver it66121_driver = {
>                 .name   = "it66121",
>                 .of_match_table = it66121_dt_match,
>         },
> -       .probe_new = it66121_probe,
> +       .probe = it66121_probe,
>         .remove = it66121_remove,
>         .id_table = it66121_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c
> index 13c131ade268..4eaea67fb71c 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt8912b.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c
> @@ -773,7 +773,7 @@ static struct i2c_driver lt8912_i2c_driver = {
>                 .name = "lt8912",
>                 .of_match_table = lt8912_dt_match,
>         },
> -       .probe_new = lt8912_probe,
> +       .probe = lt8912_probe,
>         .remove = lt8912_remove,
>         .id_table = lt8912_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9211.c b/drivers/gpu/drm/bridge/lontium-lt9211.c
> index 3e19fff6547a..0ab7c07c2c84 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9211.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9211.c
> @@ -785,7 +785,7 @@ static const struct of_device_id lt9211_match_table[] = {
>  MODULE_DEVICE_TABLE(of, lt9211_match_table);
>  
>  static struct i2c_driver lt9211_driver = {
> -       .probe_new = lt9211_probe,
> +       .probe = lt9211_probe,
>         .remove = lt9211_remove,
>         .id_table = lt9211_id,
>         .driver = {
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
> index a25d21a7d5c1..9663601ce098 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
> @@ -1190,7 +1190,7 @@ static struct i2c_driver lt9611_driver = {
>                 .name = "lt9611",
>                 .of_match_table = lt9611_match_table,
>         },
> -       .probe_new = lt9611_probe,
> +       .probe = lt9611_probe,
>         .remove = lt9611_remove,
>         .id_table = lt9611_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> index 583daacf3705..2a57e804ea02 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> @@ -1011,7 +1011,7 @@ static struct i2c_driver lt9611uxc_driver = {
>                 .of_match_table = lt9611uxc_match_table,
>                 .dev_groups = lt9611uxc_attr_groups,
>         },
> -       .probe_new = lt9611uxc_probe,
> +       .probe = lt9611uxc_probe,
>         .remove = lt9611uxc_remove,
>         .id_table = lt9611uxc_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index 4fc494d9084b..460db3c8a08c 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -375,7 +375,7 @@ MODULE_DEVICE_TABLE(of, stdp4028_ge_b850v3_fw_match);
>  
>  static struct i2c_driver stdp4028_ge_b850v3_fw_driver = {
>         .id_table       = stdp4028_ge_b850v3_fw_i2c_table,
> -       .probe_new      = stdp4028_ge_b850v3_fw_probe,
> +       .probe          = stdp4028_ge_b850v3_fw_probe,
>         .remove         = stdp4028_ge_b850v3_fw_remove,
>         .driver         = {
>                 .name           = "stdp4028-ge-b850v3-fw",
> @@ -422,7 +422,7 @@ MODULE_DEVICE_TABLE(of, stdp2690_ge_b850v3_fw_match);
>  
>  static struct i2c_driver stdp2690_ge_b850v3_fw_driver = {
>         .id_table       = stdp2690_ge_b850v3_fw_i2c_table,
> -       .probe_new      = stdp2690_ge_b850v3_fw_probe,
> +       .probe          = stdp2690_ge_b850v3_fw_probe,
>         .remove         = stdp2690_ge_b850v3_fw_remove,
>         .driver         = {
>                 .name           = "stdp2690-ge-b850v3-fw",
> diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> index cd292a2f894c..d81920227a8a 100644
> --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> @@ -335,7 +335,7 @@ MODULE_DEVICE_TABLE(of, ptn3460_match);
>  
>  static struct i2c_driver ptn3460_driver = {
>         .id_table       = ptn3460_i2c_table,
> -       .probe_new      = ptn3460_probe,
> +       .probe          = ptn3460_probe,
>         .remove         = ptn3460_remove,
>         .driver         = {
>                 .name   = "nxp,ptn3460",
> diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
> index efa80e309b98..c9b6cb7678e3 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8622.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8622.c
> @@ -538,7 +538,7 @@ MODULE_DEVICE_TABLE(i2c, ps8622_i2c_table);
>  
>  static struct i2c_driver ps8622_driver = {
>         .id_table       = ps8622_i2c_table,
> -       .probe_new      = ps8622_probe,
> +       .probe          = ps8622_probe,
>         .remove         = ps8622_remove,
>         .driver         = {
>                 .name   = "ps8622",
> diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
> index c3eb45179405..8801cdd033b5 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8640.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8640.c
> @@ -791,7 +791,7 @@ static const struct of_device_id ps8640_match[] = {
>  MODULE_DEVICE_TABLE(of, ps8640_match);
>  
>  static struct i2c_driver ps8640_driver = {
> -       .probe_new = ps8640_probe,
> +       .probe = ps8640_probe,
>         .remove = ps8640_remove,
>         .driver = {
>                 .name = "ps8640",
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index ef66461e7f7c..aac239729a1d 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -1151,7 +1151,7 @@ static const struct i2c_device_id sii902x_i2c_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, sii902x_i2c_ids);
>  
>  static struct i2c_driver sii902x_driver = {
> -       .probe_new = sii902x_probe,
> +       .probe = sii902x_probe,
>         .remove = sii902x_remove,
>         .driver = {
>                 .name = "sii902x",
> diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
> index 2d17f227867b..d8373d918324 100644
> --- a/drivers/gpu/drm/bridge/sii9234.c
> +++ b/drivers/gpu/drm/bridge/sii9234.c
> @@ -955,7 +955,7 @@ static struct i2c_driver sii9234_driver = {
>                 .name   = "sii9234",
>                 .of_match_table = sii9234_dt_match,
>         },
> -       .probe_new = sii9234_probe,
> +       .probe = sii9234_probe,
>         .remove = sii9234_remove,
>         .id_table = sii9234_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
> index b96d03cd878d..79b09ccd1353 100644
> --- a/drivers/gpu/drm/bridge/sil-sii8620.c
> +++ b/drivers/gpu/drm/bridge/sil-sii8620.c
> @@ -2378,7 +2378,7 @@ static struct i2c_driver sii8620_driver = {
>                 .name   = "sii8620",
>                 .of_match_table = of_match_ptr(sii8620_dt_match),
>         },
> -       .probe_new      = sii8620_probe,
> +       .probe          = sii8620_probe,
>         .remove         = sii8620_remove,
>         .id_table = sii8620_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index 91f7cb56a654..4dcf899715ac 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -2209,7 +2209,7 @@ static struct i2c_driver tc358767_driver = {
>                 .of_match_table = tc358767_of_ids,
>         },
>         .id_table = tc358767_i2c_ids,
> -       .probe_new = tc_probe,
> +       .probe = tc_probe,
>         .remove = tc_remove,
>  };
>  module_i2c_driver(tc358767_driver);
> diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c
> index 7c0cbe84611b..783c3fd896ca 100644
> --- a/drivers/gpu/drm/bridge/tc358768.c
> +++ b/drivers/gpu/drm/bridge/tc358768.c
> @@ -1083,7 +1083,7 @@ static struct i2c_driver tc358768_driver = {
>                 .of_match_table = tc358768_of_ids,
>         },
>         .id_table = tc358768_i2c_ids,
> -       .probe_new = tc358768_i2c_probe,
> +       .probe = tc358768_i2c_probe,
>         .remove = tc358768_i2c_remove,
>  };
>  module_i2c_driver(tc358768_driver);
> diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc358775.c
> index 19316994ddd1..90a89d70d832 100644
> --- a/drivers/gpu/drm/bridge/tc358775.c
> +++ b/drivers/gpu/drm/bridge/tc358775.c
> @@ -728,7 +728,7 @@ static struct i2c_driver tc358775_driver = {
>                 .of_match_table = tc358775_of_ids,
>         },
>         .id_table = tc358775_i2c_ids,
> -       .probe_new = tc_probe,
> +       .probe = tc_probe,
>         .remove = tc_remove,
>  };
>  module_i2c_driver(tc358775_driver);
> diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> index 186a9e2ff24d..b65632ec7e7d 100644
> --- a/drivers/gpu/drm/bridge/ti-dlpc3433.c
> +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> @@ -400,7 +400,7 @@ static const struct of_device_id dlpc3433_match_table[] = {
>  MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
>  
>  static struct i2c_driver dlpc3433_driver = {
> -       .probe_new = dlpc3433_probe,
> +       .probe = dlpc3433_probe,
>         .remove = dlpc3433_remove,
>         .id_table = dlpc3433_id,
>         .driver = {
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> index 75286c9afbb9..e26a8acb9f6b 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> @@ -734,7 +734,7 @@ static const struct of_device_id sn65dsi83_match_table[] = {
>  MODULE_DEVICE_TABLE(of, sn65dsi83_match_table);
>  
>  static struct i2c_driver sn65dsi83_driver = {
> -       .probe_new = sn65dsi83_probe,
> +       .probe = sn65dsi83_probe,
>         .remove = sn65dsi83_remove,
>         .id_table = sn65dsi83_id,
>         .driver = {
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> index 7a748785c545..62ec377f2183 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> @@ -1951,7 +1951,7 @@ static struct i2c_driver ti_sn65dsi86_driver = {
>                 .of_match_table = ti_sn65dsi86_match_table,
>                 .pm = &ti_sn65dsi86_pm_ops,
>         },
> -       .probe_new = ti_sn65dsi86_probe,
> +       .probe = ti_sn65dsi86_probe,
>         .id_table = ti_sn65dsi86_id,
>  };
>  
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index ab63225cd635..c06390da9ffd 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -408,7 +408,7 @@ static struct i2c_driver tfp410_i2c_driver = {
>                 .of_match_table = of_match_ptr(tfp410_match),
>         },
>         .id_table       = tfp410_i2c_ids,
> -       .probe_new      = tfp410_i2c_probe,
> +       .probe          = tfp410_i2c_probe,
>         .remove         = tfp410_i2c_remove,
>  };
>  #endif /* IS_ENABLED(CONFIG_I2C) */
> diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c
> index b8c143e573e0..82d618c40dce 100644
> --- a/drivers/gpu/drm/i2c/tda9950.c
> +++ b/drivers/gpu/drm/i2c/tda9950.c
> @@ -492,7 +492,7 @@ static struct i2c_device_id tda9950_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, tda9950_ids);
>  
>  static struct i2c_driver tda9950_driver = {
> -       .probe_new = tda9950_probe,
> +       .probe = tda9950_probe,
>         .remove = tda9950_remove,
>         .driver = {
>                 .name = "tda9950",
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index db5c9343a3d2..40bcd9067e69 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -2099,7 +2099,7 @@ static const struct i2c_device_id tda998x_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, tda998x_ids);
>  
>  static struct i2c_driver tda998x_driver = {
> -       .probe_new = tda998x_probe,
> +       .probe = tda998x_probe,
>         .remove = tda998x_remove,
>         .driver = {
>                 .name = "tda998x",
> diff --git a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> index aba556c98300..4819ada69482 100644
> --- a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> +++ b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> @@ -308,7 +308,7 @@ static struct i2c_driver lcd_olinuxino_driver = {
>                 .name = "lcd_olinuxino",
>                 .of_match_table = lcd_olinuxino_of_ids,
>         },
> -       .probe_new = lcd_olinuxino_probe,
> +       .probe = lcd_olinuxino_probe,
>         .remove = lcd_olinuxino_remove,
>  };
>  
> diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> index 11d6ca276c1e..90ea91e4311d 100644
> --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> @@ -489,7 +489,7 @@ static struct i2c_driver rpi_touchscreen_driver = {
>                 .name = "rpi_touchscreen",
>                 .of_match_table = rpi_touchscreen_of_ids,
>         },
> -       .probe_new = rpi_touchscreen_probe,
> +       .probe = rpi_touchscreen_probe,
>         .remove = rpi_touchscreen_remove,
>  };
>  
> diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomon/ssd130x-i2c.c
> index ddfa0bb5d9c9..b4eb2d64bf6e 100644
> --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c
> +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c
> @@ -100,7 +100,7 @@ static struct i2c_driver ssd130x_i2c_driver = {
>                 .name = DRIVER_NAME,
>                 .of_match_table = ssd130x_of_match,
>         },
> -       .probe_new = ssd130x_i2c_probe,
> +       .probe = ssd130x_i2c_probe,
>         .remove = ssd130x_i2c_remove,
>         .shutdown = ssd130x_i2c_shutdown,
>  };
> 
> base-commit: ac9a78681b921877518763ba0e89202254349d1b
> -- 
> 2.39.2
>

Martyn Welch May 26, 2023, 9:48 a.m. UTC | #2

On 26/05/2023 10:07, 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
> 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 <[e-mail]>


FWIW:

Reviewed-by: Martyn Welch <[e-mail]>


> ---
> Hello,
>
> I didn't get feedback for (implicit) v1 that was sent with Message-Id:
> <[e-mail]>. This is a
> rebase on v6.4-rc1 as the former patch doesn't apply cleanly any more.
>
> I also added more people to Cc, maybe that helps to get feedback.
>
> This patch is based on v6.4-rc1, and applies fine on today's next.
> (There are also no new drivers that need adaption in next.)
>
> Thanks for considering,
> Uwe
>
>   drivers/gpu/drm/bridge/adv7511/adv7511_drv.c             | 2 +-
>   drivers/gpu/drm/bridge/analogix/analogix-anx6345.c       | 2 +-
>   drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c       | 2 +-
>   drivers/gpu/drm/bridge/analogix/anx7625.c                | 2 +-
>   drivers/gpu/drm/bridge/chipone-icn6211.c                 | 2 +-
>   drivers/gpu/drm/bridge/chrontel-ch7033.c                 | 2 +-
>   drivers/gpu/drm/bridge/cros-ec-anx7688.c                 | 2 +-
>   drivers/gpu/drm/bridge/ite-it6505.c                      | 2 +-
>   drivers/gpu/drm/bridge/ite-it66121.c                     | 2 +-
>   drivers/gpu/drm/bridge/lontium-lt8912b.c                 | 2 +-
>   drivers/gpu/drm/bridge/lontium-lt9211.c                  | 2 +-
>   drivers/gpu/drm/bridge/lontium-lt9611.c                  | 2 +-
>   drivers/gpu/drm/bridge/lontium-lt9611uxc.c               | 2 +-
>   drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 ++--
>   drivers/gpu/drm/bridge/nxp-ptn3460.c                     | 2 +-
>   drivers/gpu/drm/bridge/parade-ps8622.c                   | 2 +-
>   drivers/gpu/drm/bridge/parade-ps8640.c                   | 2 +-
>   drivers/gpu/drm/bridge/sii902x.c                         | 2 +-
>   drivers/gpu/drm/bridge/sii9234.c                         | 2 +-
>   drivers/gpu/drm/bridge/sil-sii8620.c                     | 2 +-
>   drivers/gpu/drm/bridge/tc358767.c                        | 2 +-
>   drivers/gpu/drm/bridge/tc358768.c                        | 2 +-
>   drivers/gpu/drm/bridge/tc358775.c                        | 2 +-
>   drivers/gpu/drm/bridge/ti-dlpc3433.c                     | 2 +-
>   drivers/gpu/drm/bridge/ti-sn65dsi83.c                    | 2 +-
>   drivers/gpu/drm/bridge/ti-sn65dsi86.c                    | 2 +-
>   drivers/gpu/drm/bridge/ti-tfp410.c                       | 2 +-
>   drivers/gpu/drm/i2c/tda9950.c                            | 2 +-
>   drivers/gpu/drm/i2c/tda998x_drv.c                        | 2 +-
>   drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c       | 2 +-
>   drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c    | 2 +-
>   drivers/gpu/drm/solomon/ssd130x-i2c.c                    | 2 +-
>   32 files changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index ddceafa7b637..2254457ab5d0 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -1393,7 +1393,7 @@ static struct i2c_driver adv7511_driver = {
>   		.of_match_table = adv7511_of_ids,
>   	},
>   	.id_table = adv7511_i2c_ids,
> -	.probe_new = adv7511_probe,
> +	.probe = adv7511_probe,
>   	.remove = adv7511_remove,
>   };
>   
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> index 3577c532abb4..72ab2ab77081 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> @@ -815,7 +815,7 @@ static struct i2c_driver anx6345_driver = {
>   		   .name = "anx6345",
>   		   .of_match_table = of_match_ptr(anx6345_match_table),
>   		  },
> -	.probe_new = anx6345_i2c_probe,
> +	.probe = anx6345_i2c_probe,
>   	.remove = anx6345_i2c_remove,
>   	.id_table = anx6345_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> index a3a38bbe2786..06a3e3243e19 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> @@ -1389,7 +1389,7 @@ static struct i2c_driver anx78xx_driver = {
>   		   .name = "anx7814",
>   		   .of_match_table = of_match_ptr(anx78xx_match_table),
>   		  },
> -	.probe_new = anx78xx_i2c_probe,
> +	.probe = anx78xx_i2c_probe,
>   	.remove = anx78xx_i2c_remove,
>   	.id_table = anx78xx_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 6846199a2ee1..0a97364ba8ea 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -2753,7 +2753,7 @@ static struct i2c_driver anx7625_driver = {
>   		.of_match_table = anx_match_table,
>   		.pm = &anx7625_pm_ops,
>   	},
> -	.probe_new = anx7625_i2c_probe,
> +	.probe = anx7625_i2c_probe,
>   	.remove = anx7625_i2c_remove,
>   
>   	.id_table = anx7625_id,
> diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
> index 0e37840cd7a8..8bfce21d6b90 100644
> --- a/drivers/gpu/drm/bridge/chipone-icn6211.c
> +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c
> @@ -795,7 +795,7 @@ static struct i2c_device_id chipone_i2c_id[] = {
>   MODULE_DEVICE_TABLE(i2c, chipone_i2c_id);
>   
>   static struct i2c_driver chipone_i2c_driver = {
> -	.probe_new = chipone_i2c_probe,
> +	.probe = chipone_i2c_probe,
>   	.id_table = chipone_i2c_id,
>   	.driver = {
>   		.name = "chipone-icn6211-i2c",
> diff --git a/drivers/gpu/drm/bridge/chrontel-ch7033.c b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> index 339b759e4c81..a854eb84e399 100644
> --- a/drivers/gpu/drm/bridge/chrontel-ch7033.c
> +++ b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> @@ -603,7 +603,7 @@ static const struct i2c_device_id ch7033_ids[] = {
>   MODULE_DEVICE_TABLE(i2c, ch7033_ids);
>   
>   static struct i2c_driver ch7033_driver = {
> -	.probe_new = ch7033_probe,
> +	.probe = ch7033_probe,
>   	.remove = ch7033_remove,
>   	.driver = {
>   		.name = "ch7033",
> diff --git a/drivers/gpu/drm/bridge/cros-ec-anx7688.c b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> index fa91bdeddef0..c8abd9920fee 100644
> --- a/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> +++ b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> @@ -173,7 +173,7 @@ static const struct of_device_id cros_ec_anx7688_bridge_match_table[] = {
>   MODULE_DEVICE_TABLE(of, cros_ec_anx7688_bridge_match_table);
>   
>   static struct i2c_driver cros_ec_anx7688_bridge_driver = {
> -	.probe_new = cros_ec_anx7688_bridge_probe,
> +	.probe = cros_ec_anx7688_bridge_probe,
>   	.remove = cros_ec_anx7688_bridge_remove,
>   	.driver = {
>   		.name = "cros-ec-anx7688-bridge",
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
> index abaf6e23775e..a4cc51cf6e06 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -3478,7 +3478,7 @@ static struct i2c_driver it6505_i2c_driver = {
>   		.of_match_table = it6505_of_match,
>   		.pm = &it6505_bridge_pm_ops,
>   	},
> -	.probe_new = it6505_i2c_probe,
> +	.probe = it6505_i2c_probe,
>   	.remove = it6505_i2c_remove,
>   	.shutdown = it6505_shutdown,
>   	.id_table = it6505_id,
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index a2d723d6a4be..466641c77fe9 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -1640,7 +1640,7 @@ static struct i2c_driver it66121_driver = {
>   		.name	= "it66121",
>   		.of_match_table = it66121_dt_match,
>   	},
> -	.probe_new = it66121_probe,
> +	.probe = it66121_probe,
>   	.remove = it66121_remove,
>   	.id_table = it66121_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c
> index 13c131ade268..4eaea67fb71c 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt8912b.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c
> @@ -773,7 +773,7 @@ static struct i2c_driver lt8912_i2c_driver = {
>   		.name = "lt8912",
>   		.of_match_table = lt8912_dt_match,
>   	},
> -	.probe_new = lt8912_probe,
> +	.probe = lt8912_probe,
>   	.remove = lt8912_remove,
>   	.id_table = lt8912_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9211.c b/drivers/gpu/drm/bridge/lontium-lt9211.c
> index 3e19fff6547a..0ab7c07c2c84 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9211.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9211.c
> @@ -785,7 +785,7 @@ static const struct of_device_id lt9211_match_table[] = {
>   MODULE_DEVICE_TABLE(of, lt9211_match_table);
>   
>   static struct i2c_driver lt9211_driver = {
> -	.probe_new = lt9211_probe,
> +	.probe = lt9211_probe,
>   	.remove = lt9211_remove,
>   	.id_table = lt9211_id,
>   	.driver = {
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
> index a25d21a7d5c1..9663601ce098 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
> @@ -1190,7 +1190,7 @@ static struct i2c_driver lt9611_driver = {
>   		.name = "lt9611",
>   		.of_match_table = lt9611_match_table,
>   	},
> -	.probe_new = lt9611_probe,
> +	.probe = lt9611_probe,
>   	.remove = lt9611_remove,
>   	.id_table = lt9611_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> index 583daacf3705..2a57e804ea02 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> @@ -1011,7 +1011,7 @@ static struct i2c_driver lt9611uxc_driver = {
>   		.of_match_table = lt9611uxc_match_table,
>   		.dev_groups = lt9611uxc_attr_groups,
>   	},
> -	.probe_new = lt9611uxc_probe,
> +	.probe = lt9611uxc_probe,
>   	.remove = lt9611uxc_remove,
>   	.id_table = lt9611uxc_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index 4fc494d9084b..460db3c8a08c 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -375,7 +375,7 @@ MODULE_DEVICE_TABLE(of, stdp4028_ge_b850v3_fw_match);
>   
>   static struct i2c_driver stdp4028_ge_b850v3_fw_driver = {
>   	.id_table	= stdp4028_ge_b850v3_fw_i2c_table,
> -	.probe_new	= stdp4028_ge_b850v3_fw_probe,
> +	.probe		= stdp4028_ge_b850v3_fw_probe,
>   	.remove		= stdp4028_ge_b850v3_fw_remove,
>   	.driver		= {
>   		.name		= "stdp4028-ge-b850v3-fw",
> @@ -422,7 +422,7 @@ MODULE_DEVICE_TABLE(of, stdp2690_ge_b850v3_fw_match);
>   
>   static struct i2c_driver stdp2690_ge_b850v3_fw_driver = {
>   	.id_table	= stdp2690_ge_b850v3_fw_i2c_table,
> -	.probe_new	= stdp2690_ge_b850v3_fw_probe,
> +	.probe		= stdp2690_ge_b850v3_fw_probe,
>   	.remove		= stdp2690_ge_b850v3_fw_remove,
>   	.driver		= {
>   		.name		= "stdp2690-ge-b850v3-fw",
> diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> index cd292a2f894c..d81920227a8a 100644
> --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> @@ -335,7 +335,7 @@ MODULE_DEVICE_TABLE(of, ptn3460_match);
>   
>   static struct i2c_driver ptn3460_driver = {
>   	.id_table	= ptn3460_i2c_table,
> -	.probe_new	= ptn3460_probe,
> +	.probe		= ptn3460_probe,
>   	.remove		= ptn3460_remove,
>   	.driver		= {
>   		.name	= "nxp,ptn3460",
> diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
> index efa80e309b98..c9b6cb7678e3 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8622.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8622.c
> @@ -538,7 +538,7 @@ MODULE_DEVICE_TABLE(i2c, ps8622_i2c_table);
>   
>   static struct i2c_driver ps8622_driver = {
>   	.id_table	= ps8622_i2c_table,
> -	.probe_new	= ps8622_probe,
> +	.probe		= ps8622_probe,
>   	.remove		= ps8622_remove,
>   	.driver		= {
>   		.name	= "ps8622",
> diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
> index c3eb45179405..8801cdd033b5 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8640.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8640.c
> @@ -791,7 +791,7 @@ static const struct of_device_id ps8640_match[] = {
>   MODULE_DEVICE_TABLE(of, ps8640_match);
>   
>   static struct i2c_driver ps8640_driver = {
> -	.probe_new = ps8640_probe,
> +	.probe = ps8640_probe,
>   	.remove = ps8640_remove,
>   	.driver = {
>   		.name = "ps8640",
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index ef66461e7f7c..aac239729a1d 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -1151,7 +1151,7 @@ static const struct i2c_device_id sii902x_i2c_ids[] = {
>   MODULE_DEVICE_TABLE(i2c, sii902x_i2c_ids);
>   
>   static struct i2c_driver sii902x_driver = {
> -	.probe_new = sii902x_probe,
> +	.probe = sii902x_probe,
>   	.remove = sii902x_remove,
>   	.driver = {
>   		.name = "sii902x",
> diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
> index 2d17f227867b..d8373d918324 100644
> --- a/drivers/gpu/drm/bridge/sii9234.c
> +++ b/drivers/gpu/drm/bridge/sii9234.c
> @@ -955,7 +955,7 @@ static struct i2c_driver sii9234_driver = {
>   		.name	= "sii9234",
>   		.of_match_table = sii9234_dt_match,
>   	},
> -	.probe_new = sii9234_probe,
> +	.probe = sii9234_probe,
>   	.remove = sii9234_remove,
>   	.id_table = sii9234_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
> index b96d03cd878d..79b09ccd1353 100644
> --- a/drivers/gpu/drm/bridge/sil-sii8620.c
> +++ b/drivers/gpu/drm/bridge/sil-sii8620.c
> @@ -2378,7 +2378,7 @@ static struct i2c_driver sii8620_driver = {
>   		.name	= "sii8620",
>   		.of_match_table = of_match_ptr(sii8620_dt_match),
>   	},
> -	.probe_new	= sii8620_probe,
> +	.probe		= sii8620_probe,
>   	.remove		= sii8620_remove,
>   	.id_table = sii8620_id,
>   };
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index 91f7cb56a654..4dcf899715ac 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -2209,7 +2209,7 @@ static struct i2c_driver tc358767_driver = {
>   		.of_match_table = tc358767_of_ids,
>   	},
>   	.id_table = tc358767_i2c_ids,
> -	.probe_new = tc_probe,
> +	.probe = tc_probe,
>   	.remove	= tc_remove,
>   };
>   module_i2c_driver(tc358767_driver);
> diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c
> index 7c0cbe84611b..783c3fd896ca 100644
> --- a/drivers/gpu/drm/bridge/tc358768.c
> +++ b/drivers/gpu/drm/bridge/tc358768.c
> @@ -1083,7 +1083,7 @@ static struct i2c_driver tc358768_driver = {
>   		.of_match_table = tc358768_of_ids,
>   	},
>   	.id_table = tc358768_i2c_ids,
> -	.probe_new = tc358768_i2c_probe,
> +	.probe = tc358768_i2c_probe,
>   	.remove	= tc358768_i2c_remove,
>   };
>   module_i2c_driver(tc358768_driver);
> diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc358775.c
> index 19316994ddd1..90a89d70d832 100644
> --- a/drivers/gpu/drm/bridge/tc358775.c
> +++ b/drivers/gpu/drm/bridge/tc358775.c
> @@ -728,7 +728,7 @@ static struct i2c_driver tc358775_driver = {
>   		.of_match_table = tc358775_of_ids,
>   	},
>   	.id_table = tc358775_i2c_ids,
> -	.probe_new = tc_probe,
> +	.probe = tc_probe,
>   	.remove	= tc_remove,
>   };
>   module_i2c_driver(tc358775_driver);
> diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> index 186a9e2ff24d..b65632ec7e7d 100644
> --- a/drivers/gpu/drm/bridge/ti-dlpc3433.c
> +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> @@ -400,7 +400,7 @@ static const struct of_device_id dlpc3433_match_table[] = {
>   MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
>   
>   static struct i2c_driver dlpc3433_driver = {
> -	.probe_new = dlpc3433_probe,
> +	.probe = dlpc3433_probe,
>   	.remove = dlpc3433_remove,
>   	.id_table = dlpc3433_id,
>   	.driver = {
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> index 75286c9afbb9..e26a8acb9f6b 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> @@ -734,7 +734,7 @@ static const struct of_device_id sn65dsi83_match_table[] = {
>   MODULE_DEVICE_TABLE(of, sn65dsi83_match_table);
>   
>   static struct i2c_driver sn65dsi83_driver = {
> -	.probe_new = sn65dsi83_probe,
> +	.probe = sn65dsi83_probe,
>   	.remove = sn65dsi83_remove,
>   	.id_table = sn65dsi83_id,
>   	.driver = {
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> index 7a748785c545..62ec377f2183 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> @@ -1951,7 +1951,7 @@ static struct i2c_driver ti_sn65dsi86_driver = {
>   		.of_match_table = ti_sn65dsi86_match_table,
>   		.pm = &ti_sn65dsi86_pm_ops,
>   	},
> -	.probe_new = ti_sn65dsi86_probe,
> +	.probe = ti_sn65dsi86_probe,
>   	.id_table = ti_sn65dsi86_id,
>   };
>   
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index ab63225cd635..c06390da9ffd 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -408,7 +408,7 @@ static struct i2c_driver tfp410_i2c_driver = {
>   		.of_match_table = of_match_ptr(tfp410_match),
>   	},
>   	.id_table	= tfp410_i2c_ids,
> -	.probe_new	= tfp410_i2c_probe,
> +	.probe		= tfp410_i2c_probe,
>   	.remove		= tfp410_i2c_remove,
>   };
>   #endif /* IS_ENABLED(CONFIG_I2C) */
> diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c
> index b8c143e573e0..82d618c40dce 100644
> --- a/drivers/gpu/drm/i2c/tda9950.c
> +++ b/drivers/gpu/drm/i2c/tda9950.c
> @@ -492,7 +492,7 @@ static struct i2c_device_id tda9950_ids[] = {
>   MODULE_DEVICE_TABLE(i2c, tda9950_ids);
>   
>   static struct i2c_driver tda9950_driver = {
> -	.probe_new = tda9950_probe,
> +	.probe = tda9950_probe,
>   	.remove = tda9950_remove,
>   	.driver = {
>   		.name = "tda9950",
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index db5c9343a3d2..40bcd9067e69 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -2099,7 +2099,7 @@ static const struct i2c_device_id tda998x_ids[] = {
>   MODULE_DEVICE_TABLE(i2c, tda998x_ids);
>   
>   static struct i2c_driver tda998x_driver = {
> -	.probe_new = tda998x_probe,
> +	.probe = tda998x_probe,
>   	.remove = tda998x_remove,
>   	.driver = {
>   		.name = "tda998x",
> diff --git a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> index aba556c98300..4819ada69482 100644
> --- a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> +++ b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> @@ -308,7 +308,7 @@ static struct i2c_driver lcd_olinuxino_driver = {
>   		.name = "lcd_olinuxino",
>   		.of_match_table = lcd_olinuxino_of_ids,
>   	},
> -	.probe_new = lcd_olinuxino_probe,
> +	.probe = lcd_olinuxino_probe,
>   	.remove = lcd_olinuxino_remove,
>   };
>   
> diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> index 11d6ca276c1e..90ea91e4311d 100644
> --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> @@ -489,7 +489,7 @@ static struct i2c_driver rpi_touchscreen_driver = {
>   		.name = "rpi_touchscreen",
>   		.of_match_table = rpi_touchscreen_of_ids,
>   	},
> -	.probe_new = rpi_touchscreen_probe,
> +	.probe = rpi_touchscreen_probe,
>   	.remove = rpi_touchscreen_remove,
>   };
>   
> diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomon/ssd130x-i2c.c
> index ddfa0bb5d9c9..b4eb2d64bf6e 100644
> --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c
> +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c
> @@ -100,7 +100,7 @@ static struct i2c_driver ssd130x_i2c_driver = {
>   		.name = DRIVER_NAME,
>   		.of_match_table = ssd130x_of_match,
>   	},
> -	.probe_new = ssd130x_i2c_probe,
> +	.probe = ssd130x_i2c_probe,
>   	.remove = ssd130x_i2c_remove,
>   	.shutdown = ssd130x_i2c_shutdown,
>   };
>
> base-commit: ac9a78681b921877518763ba0e89202254349d1b

Javier Martinez Canillas May 26, 2023, 10:05 a.m. UTC | #3

Kieran Bingham <[e-mail]> writes:

Hello Uwe,

> Quoting Uwe Kleine-König (2023-05-26 10:07:09)
>> 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 <[e-mail]>
>> ---
>> Hello,
>> 
>> I didn't get feedback for (implicit) v1 that was sent with Message-Id:
>> <[e-mail]>. This is a
>> rebase on v6.4-rc1 as the former patch doesn't apply cleanly any more.
>> 
>> I also added more people to Cc, maybe that helps to get feedback.
>
> Having been invovled in b8a1a4cd5a98 ("i2c: Provide a temporary
> .probe_new() call-back type") and definitley expected 'temporary' to
> mean less than 7 years, I very much approve of this patchset.
>
> Thank you for all your efforts Uwe.
>
> Reviewed-by: Kieran Bingham <[e-mail]>
>

I strongly second what Kieran just said. I was also involved in the commit
mentioned and it is so great to see your efforts to finish that change.

Reviewed-by: Javier Martinez Canillas <[e-mail]>

Guenter Roeck May 26, 2023, 12:31 p.m. UTC | #4

On Fri, May 26, 2023 at 2:08 AM Uwe Kleine-König
<[e-mail]> 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 <[e-mail]>

FWIW:

Reviewed-by: Guenter Roeck <[e-mail]>

> ---
> Hello,
>
> I didn't get feedback for (implicit) v1 that was sent with Message-Id:
> <[e-mail]>. This is a
> rebase on v6.4-rc1 as the former patch doesn't apply cleanly any more.
>
> I also added more people to Cc, maybe that helps to get feedback.
>
> This patch is based on v6.4-rc1, and applies fine on today's next.
> (There are also no new drivers that need adaption in next.)
>
> Thanks for considering,
> Uwe
>
>  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c             | 2 +-
>  drivers/gpu/drm/bridge/analogix/analogix-anx6345.c       | 2 +-
>  drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c       | 2 +-
>  drivers/gpu/drm/bridge/analogix/anx7625.c                | 2 +-
>  drivers/gpu/drm/bridge/chipone-icn6211.c                 | 2 +-
>  drivers/gpu/drm/bridge/chrontel-ch7033.c                 | 2 +-
>  drivers/gpu/drm/bridge/cros-ec-anx7688.c                 | 2 +-
>  drivers/gpu/drm/bridge/ite-it6505.c                      | 2 +-
>  drivers/gpu/drm/bridge/ite-it66121.c                     | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt8912b.c                 | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9211.c                  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611.c                  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611uxc.c               | 2 +-
>  drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 ++--
>  drivers/gpu/drm/bridge/nxp-ptn3460.c                     | 2 +-
>  drivers/gpu/drm/bridge/parade-ps8622.c                   | 2 +-
>  drivers/gpu/drm/bridge/parade-ps8640.c                   | 2 +-
>  drivers/gpu/drm/bridge/sii902x.c                         | 2 +-
>  drivers/gpu/drm/bridge/sii9234.c                         | 2 +-
>  drivers/gpu/drm/bridge/sil-sii8620.c                     | 2 +-
>  drivers/gpu/drm/bridge/tc358767.c                        | 2 +-
>  drivers/gpu/drm/bridge/tc358768.c                        | 2 +-
>  drivers/gpu/drm/bridge/tc358775.c                        | 2 +-
>  drivers/gpu/drm/bridge/ti-dlpc3433.c                     | 2 +-
>  drivers/gpu/drm/bridge/ti-sn65dsi83.c                    | 2 +-
>  drivers/gpu/drm/bridge/ti-sn65dsi86.c                    | 2 +-
>  drivers/gpu/drm/bridge/ti-tfp410.c                       | 2 +-
>  drivers/gpu/drm/i2c/tda9950.c                            | 2 +-
>  drivers/gpu/drm/i2c/tda998x_drv.c                        | 2 +-
>  drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c       | 2 +-
>  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c    | 2 +-
>  drivers/gpu/drm/solomon/ssd130x-i2c.c                    | 2 +-
>  32 files changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index ddceafa7b637..2254457ab5d0 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -1393,7 +1393,7 @@ static struct i2c_driver adv7511_driver = {
>                 .of_match_table = adv7511_of_ids,
>         },
>         .id_table = adv7511_i2c_ids,
> -       .probe_new = adv7511_probe,
> +       .probe = adv7511_probe,
>         .remove = adv7511_remove,
>  };
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> index 3577c532abb4..72ab2ab77081 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> @@ -815,7 +815,7 @@ static struct i2c_driver anx6345_driver = {
>                    .name = "anx6345",
>                    .of_match_table = of_match_ptr(anx6345_match_table),
>                   },
> -       .probe_new = anx6345_i2c_probe,
> +       .probe = anx6345_i2c_probe,
>         .remove = anx6345_i2c_remove,
>         .id_table = anx6345_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> index a3a38bbe2786..06a3e3243e19 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
> @@ -1389,7 +1389,7 @@ static struct i2c_driver anx78xx_driver = {
>                    .name = "anx7814",
>                    .of_match_table = of_match_ptr(anx78xx_match_table),
>                   },
> -       .probe_new = anx78xx_i2c_probe,
> +       .probe = anx78xx_i2c_probe,
>         .remove = anx78xx_i2c_remove,
>         .id_table = anx78xx_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 6846199a2ee1..0a97364ba8ea 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -2753,7 +2753,7 @@ static struct i2c_driver anx7625_driver = {
>                 .of_match_table = anx_match_table,
>                 .pm = &anx7625_pm_ops,
>         },
> -       .probe_new = anx7625_i2c_probe,
> +       .probe = anx7625_i2c_probe,
>         .remove = anx7625_i2c_remove,
>
>         .id_table = anx7625_id,
> diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
> index 0e37840cd7a8..8bfce21d6b90 100644
> --- a/drivers/gpu/drm/bridge/chipone-icn6211.c
> +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c
> @@ -795,7 +795,7 @@ static struct i2c_device_id chipone_i2c_id[] = {
>  MODULE_DEVICE_TABLE(i2c, chipone_i2c_id);
>
>  static struct i2c_driver chipone_i2c_driver = {
> -       .probe_new = chipone_i2c_probe,
> +       .probe = chipone_i2c_probe,
>         .id_table = chipone_i2c_id,
>         .driver = {
>                 .name = "chipone-icn6211-i2c",
> diff --git a/drivers/gpu/drm/bridge/chrontel-ch7033.c b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> index 339b759e4c81..a854eb84e399 100644
> --- a/drivers/gpu/drm/bridge/chrontel-ch7033.c
> +++ b/drivers/gpu/drm/bridge/chrontel-ch7033.c
> @@ -603,7 +603,7 @@ static const struct i2c_device_id ch7033_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, ch7033_ids);
>
>  static struct i2c_driver ch7033_driver = {
> -       .probe_new = ch7033_probe,
> +       .probe = ch7033_probe,
>         .remove = ch7033_remove,
>         .driver = {
>                 .name = "ch7033",
> diff --git a/drivers/gpu/drm/bridge/cros-ec-anx7688.c b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> index fa91bdeddef0..c8abd9920fee 100644
> --- a/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> +++ b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
> @@ -173,7 +173,7 @@ static const struct of_device_id cros_ec_anx7688_bridge_match_table[] = {
>  MODULE_DEVICE_TABLE(of, cros_ec_anx7688_bridge_match_table);
>
>  static struct i2c_driver cros_ec_anx7688_bridge_driver = {
> -       .probe_new = cros_ec_anx7688_bridge_probe,
> +       .probe = cros_ec_anx7688_bridge_probe,
>         .remove = cros_ec_anx7688_bridge_remove,
>         .driver = {
>                 .name = "cros-ec-anx7688-bridge",
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
> index abaf6e23775e..a4cc51cf6e06 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -3478,7 +3478,7 @@ static struct i2c_driver it6505_i2c_driver = {
>                 .of_match_table = it6505_of_match,
>                 .pm = &it6505_bridge_pm_ops,
>         },
> -       .probe_new = it6505_i2c_probe,
> +       .probe = it6505_i2c_probe,
>         .remove = it6505_i2c_remove,
>         .shutdown = it6505_shutdown,
>         .id_table = it6505_id,
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index a2d723d6a4be..466641c77fe9 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -1640,7 +1640,7 @@ static struct i2c_driver it66121_driver = {
>                 .name   = "it66121",
>                 .of_match_table = it66121_dt_match,
>         },
> -       .probe_new = it66121_probe,
> +       .probe = it66121_probe,
>         .remove = it66121_remove,
>         .id_table = it66121_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c
> index 13c131ade268..4eaea67fb71c 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt8912b.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c
> @@ -773,7 +773,7 @@ static struct i2c_driver lt8912_i2c_driver = {
>                 .name = "lt8912",
>                 .of_match_table = lt8912_dt_match,
>         },
> -       .probe_new = lt8912_probe,
> +       .probe = lt8912_probe,
>         .remove = lt8912_remove,
>         .id_table = lt8912_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9211.c b/drivers/gpu/drm/bridge/lontium-lt9211.c
> index 3e19fff6547a..0ab7c07c2c84 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9211.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9211.c
> @@ -785,7 +785,7 @@ static const struct of_device_id lt9211_match_table[] = {
>  MODULE_DEVICE_TABLE(of, lt9211_match_table);
>
>  static struct i2c_driver lt9211_driver = {
> -       .probe_new = lt9211_probe,
> +       .probe = lt9211_probe,
>         .remove = lt9211_remove,
>         .id_table = lt9211_id,
>         .driver = {
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
> index a25d21a7d5c1..9663601ce098 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
> @@ -1190,7 +1190,7 @@ static struct i2c_driver lt9611_driver = {
>                 .name = "lt9611",
>                 .of_match_table = lt9611_match_table,
>         },
> -       .probe_new = lt9611_probe,
> +       .probe = lt9611_probe,
>         .remove = lt9611_remove,
>         .id_table = lt9611_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> index 583daacf3705..2a57e804ea02 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> @@ -1011,7 +1011,7 @@ static struct i2c_driver lt9611uxc_driver = {
>                 .of_match_table = lt9611uxc_match_table,
>                 .dev_groups = lt9611uxc_attr_groups,
>         },
> -       .probe_new = lt9611uxc_probe,
> +       .probe = lt9611uxc_probe,
>         .remove = lt9611uxc_remove,
>         .id_table = lt9611uxc_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index 4fc494d9084b..460db3c8a08c 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -375,7 +375,7 @@ MODULE_DEVICE_TABLE(of, stdp4028_ge_b850v3_fw_match);
>
>  static struct i2c_driver stdp4028_ge_b850v3_fw_driver = {
>         .id_table       = stdp4028_ge_b850v3_fw_i2c_table,
> -       .probe_new      = stdp4028_ge_b850v3_fw_probe,
> +       .probe          = stdp4028_ge_b850v3_fw_probe,
>         .remove         = stdp4028_ge_b850v3_fw_remove,
>         .driver         = {
>                 .name           = "stdp4028-ge-b850v3-fw",
> @@ -422,7 +422,7 @@ MODULE_DEVICE_TABLE(of, stdp2690_ge_b850v3_fw_match);
>
>  static struct i2c_driver stdp2690_ge_b850v3_fw_driver = {
>         .id_table       = stdp2690_ge_b850v3_fw_i2c_table,
> -       .probe_new      = stdp2690_ge_b850v3_fw_probe,
> +       .probe          = stdp2690_ge_b850v3_fw_probe,
>         .remove         = stdp2690_ge_b850v3_fw_remove,
>         .driver         = {
>                 .name           = "stdp2690-ge-b850v3-fw",
> diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> index cd292a2f894c..d81920227a8a 100644
> --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> @@ -335,7 +335,7 @@ MODULE_DEVICE_TABLE(of, ptn3460_match);
>
>  static struct i2c_driver ptn3460_driver = {
>         .id_table       = ptn3460_i2c_table,
> -       .probe_new      = ptn3460_probe,
> +       .probe          = ptn3460_probe,
>         .remove         = ptn3460_remove,
>         .driver         = {
>                 .name   = "nxp,ptn3460",
> diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
> index efa80e309b98..c9b6cb7678e3 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8622.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8622.c
> @@ -538,7 +538,7 @@ MODULE_DEVICE_TABLE(i2c, ps8622_i2c_table);
>
>  static struct i2c_driver ps8622_driver = {
>         .id_table       = ps8622_i2c_table,
> -       .probe_new      = ps8622_probe,
> +       .probe          = ps8622_probe,
>         .remove         = ps8622_remove,
>         .driver         = {
>                 .name   = "ps8622",
> diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
> index c3eb45179405..8801cdd033b5 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8640.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8640.c
> @@ -791,7 +791,7 @@ static const struct of_device_id ps8640_match[] = {
>  MODULE_DEVICE_TABLE(of, ps8640_match);
>
>  static struct i2c_driver ps8640_driver = {
> -       .probe_new = ps8640_probe,
> +       .probe = ps8640_probe,
>         .remove = ps8640_remove,
>         .driver = {
>                 .name = "ps8640",
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index ef66461e7f7c..aac239729a1d 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -1151,7 +1151,7 @@ static const struct i2c_device_id sii902x_i2c_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, sii902x_i2c_ids);
>
>  static struct i2c_driver sii902x_driver = {
> -       .probe_new = sii902x_probe,
> +       .probe = sii902x_probe,
>         .remove = sii902x_remove,
>         .driver = {
>                 .name = "sii902x",
> diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
> index 2d17f227867b..d8373d918324 100644
> --- a/drivers/gpu/drm/bridge/sii9234.c
> +++ b/drivers/gpu/drm/bridge/sii9234.c
> @@ -955,7 +955,7 @@ static struct i2c_driver sii9234_driver = {
>                 .name   = "sii9234",
>                 .of_match_table = sii9234_dt_match,
>         },
> -       .probe_new = sii9234_probe,
> +       .probe = sii9234_probe,
>         .remove = sii9234_remove,
>         .id_table = sii9234_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
> index b96d03cd878d..79b09ccd1353 100644
> --- a/drivers/gpu/drm/bridge/sil-sii8620.c
> +++ b/drivers/gpu/drm/bridge/sil-sii8620.c
> @@ -2378,7 +2378,7 @@ static struct i2c_driver sii8620_driver = {
>                 .name   = "sii8620",
>                 .of_match_table = of_match_ptr(sii8620_dt_match),
>         },
> -       .probe_new      = sii8620_probe,
> +       .probe          = sii8620_probe,
>         .remove         = sii8620_remove,
>         .id_table = sii8620_id,
>  };
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index 91f7cb56a654..4dcf899715ac 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -2209,7 +2209,7 @@ static struct i2c_driver tc358767_driver = {
>                 .of_match_table = tc358767_of_ids,
>         },
>         .id_table = tc358767_i2c_ids,
> -       .probe_new = tc_probe,
> +       .probe = tc_probe,
>         .remove = tc_remove,
>  };
>  module_i2c_driver(tc358767_driver);
> diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c
> index 7c0cbe84611b..783c3fd896ca 100644
> --- a/drivers/gpu/drm/bridge/tc358768.c
> +++ b/drivers/gpu/drm/bridge/tc358768.c
> @@ -1083,7 +1083,7 @@ static struct i2c_driver tc358768_driver = {
>                 .of_match_table = tc358768_of_ids,
>         },
>         .id_table = tc358768_i2c_ids,
> -       .probe_new = tc358768_i2c_probe,
> +       .probe = tc358768_i2c_probe,
>         .remove = tc358768_i2c_remove,
>  };
>  module_i2c_driver(tc358768_driver);
> diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc358775.c
> index 19316994ddd1..90a89d70d832 100644
> --- a/drivers/gpu/drm/bridge/tc358775.c
> +++ b/drivers/gpu/drm/bridge/tc358775.c
> @@ -728,7 +728,7 @@ static struct i2c_driver tc358775_driver = {
>                 .of_match_table = tc358775_of_ids,
>         },
>         .id_table = tc358775_i2c_ids,
> -       .probe_new = tc_probe,
> +       .probe = tc_probe,
>         .remove = tc_remove,
>  };
>  module_i2c_driver(tc358775_driver);
> diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> index 186a9e2ff24d..b65632ec7e7d 100644
> --- a/drivers/gpu/drm/bridge/ti-dlpc3433.c
> +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> @@ -400,7 +400,7 @@ static const struct of_device_id dlpc3433_match_table[] = {
>  MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
>
>  static struct i2c_driver dlpc3433_driver = {
> -       .probe_new = dlpc3433_probe,
> +       .probe = dlpc3433_probe,
>         .remove = dlpc3433_remove,
>         .id_table = dlpc3433_id,
>         .driver = {
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> index 75286c9afbb9..e26a8acb9f6b 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> @@ -734,7 +734,7 @@ static const struct of_device_id sn65dsi83_match_table[] = {
>  MODULE_DEVICE_TABLE(of, sn65dsi83_match_table);
>
>  static struct i2c_driver sn65dsi83_driver = {
> -       .probe_new = sn65dsi83_probe,
> +       .probe = sn65dsi83_probe,
>         .remove = sn65dsi83_remove,
>         .id_table = sn65dsi83_id,
>         .driver = {
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> index 7a748785c545..62ec377f2183 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
> @@ -1951,7 +1951,7 @@ static struct i2c_driver ti_sn65dsi86_driver = {
>                 .of_match_table = ti_sn65dsi86_match_table,
>                 .pm = &ti_sn65dsi86_pm_ops,
>         },
> -       .probe_new = ti_sn65dsi86_probe,
> +       .probe = ti_sn65dsi86_probe,
>         .id_table = ti_sn65dsi86_id,
>  };
>
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index ab63225cd635..c06390da9ffd 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -408,7 +408,7 @@ static struct i2c_driver tfp410_i2c_driver = {
>                 .of_match_table = of_match_ptr(tfp410_match),
>         },
>         .id_table       = tfp410_i2c_ids,
> -       .probe_new      = tfp410_i2c_probe,
> +       .probe          = tfp410_i2c_probe,
>         .remove         = tfp410_i2c_remove,
>  };
>  #endif /* IS_ENABLED(CONFIG_I2C) */
> diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c
> index b8c143e573e0..82d618c40dce 100644
> --- a/drivers/gpu/drm/i2c/tda9950.c
> +++ b/drivers/gpu/drm/i2c/tda9950.c
> @@ -492,7 +492,7 @@ static struct i2c_device_id tda9950_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, tda9950_ids);
>
>  static struct i2c_driver tda9950_driver = {
> -       .probe_new = tda9950_probe,
> +       .probe = tda9950_probe,
>         .remove = tda9950_remove,
>         .driver = {
>                 .name = "tda9950",
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index db5c9343a3d2..40bcd9067e69 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -2099,7 +2099,7 @@ static const struct i2c_device_id tda998x_ids[] = {
>  MODULE_DEVICE_TABLE(i2c, tda998x_ids);
>
>  static struct i2c_driver tda998x_driver = {
> -       .probe_new = tda998x_probe,
> +       .probe = tda998x_probe,
>         .remove = tda998x_remove,
>         .driver = {
>                 .name = "tda998x",
> diff --git a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> index aba556c98300..4819ada69482 100644
> --- a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> +++ b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
> @@ -308,7 +308,7 @@ static struct i2c_driver lcd_olinuxino_driver = {
>                 .name = "lcd_olinuxino",
>                 .of_match_table = lcd_olinuxino_of_ids,
>         },
> -       .probe_new = lcd_olinuxino_probe,
> +       .probe = lcd_olinuxino_probe,
>         .remove = lcd_olinuxino_remove,
>  };
>
> diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> index 11d6ca276c1e..90ea91e4311d 100644
> --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> @@ -489,7 +489,7 @@ static struct i2c_driver rpi_touchscreen_driver = {
>                 .name = "rpi_touchscreen",
>                 .of_match_table = rpi_touchscreen_of_ids,
>         },
> -       .probe_new = rpi_touchscreen_probe,
> +       .probe = rpi_touchscreen_probe,
>         .remove = rpi_touchscreen_remove,
>  };
>
> diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomon/ssd130x-i2c.c
> index ddfa0bb5d9c9..b4eb2d64bf6e 100644
> --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c
> +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c
> @@ -100,7 +100,7 @@ static struct i2c_driver ssd130x_i2c_driver = {
>                 .name = DRIVER_NAME,
>                 .of_match_table = ssd130x_of_match,
>         },
> -       .probe_new = ssd130x_i2c_probe,
> +       .probe = ssd130x_i2c_probe,
>         .remove = ssd130x_i2c_remove,
>         .shutdown = ssd130x_i2c_shutdown,
>  };
>
> base-commit: ac9a78681b921877518763ba0e89202254349d1b
> --
> 2.39.2
>

Doug Anderson May 26, 2023, 2:43 p.m. UTC | #5

Hi,

On Fri, May 26, 2023 at 2:08 AM Uwe Kleine-König
<[e-mail]> 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 <[e-mail]>
> ---
> Hello,
>
> I didn't get feedback for (implicit) v1 that was sent with Message-Id:
> <[e-mail]>. This is a
> rebase on v6.4-rc1 as the former patch doesn't apply cleanly any more.
>
> I also added more people to Cc, maybe that helps to get feedback.
>
> This patch is based on v6.4-rc1, and applies fine on today's next.
> (There are also no new drivers that need adaption in next.)
>
> Thanks for considering,
> Uwe
>
>  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c             | 2 +-
>  drivers/gpu/drm/bridge/analogix/analogix-anx6345.c       | 2 +-
>  drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c       | 2 +-
>  drivers/gpu/drm/bridge/analogix/anx7625.c                | 2 +-
>  drivers/gpu/drm/bridge/chipone-icn6211.c                 | 2 +-
>  drivers/gpu/drm/bridge/chrontel-ch7033.c                 | 2 +-
>  drivers/gpu/drm/bridge/cros-ec-anx7688.c                 | 2 +-
>  drivers/gpu/drm/bridge/ite-it6505.c                      | 2 +-
>  drivers/gpu/drm/bridge/ite-it66121.c                     | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt8912b.c                 | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9211.c                  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611.c                  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611uxc.c               | 2 +-
>  drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 ++--
>  drivers/gpu/drm/bridge/nxp-ptn3460.c                     | 2 +-
>  drivers/gpu/drm/bridge/parade-ps8622.c                   | 2 +-
>  drivers/gpu/drm/bridge/parade-ps8640.c                   | 2 +-
>  drivers/gpu/drm/bridge/sii902x.c                         | 2 +-
>  drivers/gpu/drm/bridge/sii9234.c                         | 2 +-
>  drivers/gpu/drm/bridge/sil-sii8620.c                     | 2 +-
>  drivers/gpu/drm/bridge/tc358767.c                        | 2 +-
>  drivers/gpu/drm/bridge/tc358768.c                        | 2 +-
>  drivers/gpu/drm/bridge/tc358775.c                        | 2 +-
>  drivers/gpu/drm/bridge/ti-dlpc3433.c                     | 2 +-
>  drivers/gpu/drm/bridge/ti-sn65dsi83.c                    | 2 +-
>  drivers/gpu/drm/bridge/ti-sn65dsi86.c                    | 2 +-
>  drivers/gpu/drm/bridge/ti-tfp410.c                       | 2 +-
>  drivers/gpu/drm/i2c/tda9950.c                            | 2 +-
>  drivers/gpu/drm/i2c/tda998x_drv.c                        | 2 +-
>  drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c       | 2 +-
>  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c    | 2 +-
>  drivers/gpu/drm/solomon/ssd130x-i2c.c                    | 2 +-
>  32 files changed, 33 insertions(+), 33 deletions(-)

Reviewed-by: Douglas Anderson <[e-mail]>

This does apply to drm-misc-next and I'm happy to apply it there, but
I'm a bit iffy doing it on the Friday before a 3-day weekend (Monday
is a holiday in the US). If this is still pending next Tuesday and I'm
not swamped then, I'll plan to apply it. I'm more than happy if a
different drm commtter wants to apply it sooner. Thanks!

-Doug

Doug Anderson May 31, 2023, 2:29 a.m. UTC | #6

Hi,

On Fri, May 26, 2023 at 7:43 AM Doug Anderson <[e-mail]> wrote:
>
> Hi,
>
> On Fri, May 26, 2023 at 2:08 AM Uwe Kleine-König
> <[e-mail]> 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 <[e-mail]>
> > ---
> > Hello,
> >
> > I didn't get feedback for (implicit) v1 that was sent with Message-Id:
> > <[e-mail]>. This is a
> > rebase on v6.4-rc1 as the former patch doesn't apply cleanly any more.
> >
> > I also added more people to Cc, maybe that helps to get feedback.
> >
> > This patch is based on v6.4-rc1, and applies fine on today's next.
> > (There are also no new drivers that need adaption in next.)
> >
> > Thanks for considering,
> > Uwe
> >
> >  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c             | 2 +-
> >  drivers/gpu/drm/bridge/analogix/analogix-anx6345.c       | 2 +-
> >  drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c       | 2 +-
> >  drivers/gpu/drm/bridge/analogix/anx7625.c                | 2 +-
> >  drivers/gpu/drm/bridge/chipone-icn6211.c                 | 2 +-
> >  drivers/gpu/drm/bridge/chrontel-ch7033.c                 | 2 +-
> >  drivers/gpu/drm/bridge/cros-ec-anx7688.c                 | 2 +-
> >  drivers/gpu/drm/bridge/ite-it6505.c                      | 2 +-
> >  drivers/gpu/drm/bridge/ite-it66121.c                     | 2 +-
> >  drivers/gpu/drm/bridge/lontium-lt8912b.c                 | 2 +-
> >  drivers/gpu/drm/bridge/lontium-lt9211.c                  | 2 +-
> >  drivers/gpu/drm/bridge/lontium-lt9611.c                  | 2 +-
> >  drivers/gpu/drm/bridge/lontium-lt9611uxc.c               | 2 +-
> >  drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 ++--
> >  drivers/gpu/drm/bridge/nxp-ptn3460.c                     | 2 +-
> >  drivers/gpu/drm/bridge/parade-ps8622.c                   | 2 +-
> >  drivers/gpu/drm/bridge/parade-ps8640.c                   | 2 +-
> >  drivers/gpu/drm/bridge/sii902x.c                         | 2 +-
> >  drivers/gpu/drm/bridge/sii9234.c                         | 2 +-
> >  drivers/gpu/drm/bridge/sil-sii8620.c                     | 2 +-
> >  drivers/gpu/drm/bridge/tc358767.c                        | 2 +-
> >  drivers/gpu/drm/bridge/tc358768.c                        | 2 +-
> >  drivers/gpu/drm/bridge/tc358775.c                        | 2 +-
> >  drivers/gpu/drm/bridge/ti-dlpc3433.c                     | 2 +-
> >  drivers/gpu/drm/bridge/ti-sn65dsi83.c                    | 2 +-
> >  drivers/gpu/drm/bridge/ti-sn65dsi86.c                    | 2 +-
> >  drivers/gpu/drm/bridge/ti-tfp410.c                       | 2 +-
> >  drivers/gpu/drm/i2c/tda9950.c                            | 2 +-
> >  drivers/gpu/drm/i2c/tda998x_drv.c                        | 2 +-
> >  drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c       | 2 +-
> >  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c    | 2 +-
> >  drivers/gpu/drm/solomon/ssd130x-i2c.c                    | 2 +-
> >  32 files changed, 33 insertions(+), 33 deletions(-)
>
> Reviewed-by: Douglas Anderson <[e-mail]>
>
> This does apply to drm-misc-next and I'm happy to apply it there, but
> I'm a bit iffy doing it on the Friday before a 3-day weekend (Monday
> is a holiday in the US). If this is still pending next Tuesday and I'm
> not swamped then, I'll plan to apply it. I'm more than happy if a
> different drm commtter wants to apply it sooner. Thanks!

As promised, pushed to drm-misc-next:

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

[e-mail] July 10, 2023, 5:39 a.m. UTC | #7

Hello:

This patch was applied to chrome-platform/linux.git (for-kernelci)
by Douglas Anderson <[e-mail]>:

On Fri, 26 May 2023 11:07:09 +0200 you 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 <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [v2] drm: Switch i2c drivers back to use .probe()
    https://git.kernel.org/chrome-platform/c/332af828ce78

You are awesome, thank you!

[e-mail] July 10, 2023, 5:53 a.m. UTC | #8

Hello:

This patch was applied to chrome-platform/linux.git (for-next)
by Douglas Anderson <[e-mail]>:

On Fri, 26 May 2023 11:07:09 +0200 you 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 <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [v2] drm: Switch i2c drivers back to use .probe()
    https://git.kernel.org/chrome-platform/c/332af828ce78

You are awesome, thank you!

Patch

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index ddceafa7b637..2254457ab5d0 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -1393,7 +1393,7 @@  static struct i2c_driver adv7511_driver = {
 		.of_match_table = adv7511_of_ids,
 	},
 	.id_table = adv7511_i2c_ids,
-	.probe_new = adv7511_probe,
+	.probe = adv7511_probe,
 	.remove = adv7511_remove,
 };
 
diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
index 3577c532abb4..72ab2ab77081 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
@@ -815,7 +815,7 @@  static struct i2c_driver anx6345_driver = {
 		   .name = "anx6345",
 		   .of_match_table = of_match_ptr(anx6345_match_table),
 		  },
-	.probe_new = anx6345_i2c_probe,
+	.probe = anx6345_i2c_probe,
 	.remove = anx6345_i2c_remove,
 	.id_table = anx6345_id,
 };
diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
index a3a38bbe2786..06a3e3243e19 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
@@ -1389,7 +1389,7 @@  static struct i2c_driver anx78xx_driver = {
 		   .name = "anx7814",
 		   .of_match_table = of_match_ptr(anx78xx_match_table),
 		  },
-	.probe_new = anx78xx_i2c_probe,
+	.probe = anx78xx_i2c_probe,
 	.remove = anx78xx_i2c_remove,
 	.id_table = anx78xx_id,
 };
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 6846199a2ee1..0a97364ba8ea 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -2753,7 +2753,7 @@  static struct i2c_driver anx7625_driver = {
 		.of_match_table = anx_match_table,
 		.pm = &anx7625_pm_ops,
 	},
-	.probe_new = anx7625_i2c_probe,
+	.probe = anx7625_i2c_probe,
 	.remove = anx7625_i2c_remove,
 
 	.id_table = anx7625_id,
diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
index 0e37840cd7a8..8bfce21d6b90 100644
--- a/drivers/gpu/drm/bridge/chipone-icn6211.c
+++ b/drivers/gpu/drm/bridge/chipone-icn6211.c
@@ -795,7 +795,7 @@  static struct i2c_device_id chipone_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, chipone_i2c_id);
 
 static struct i2c_driver chipone_i2c_driver = {
-	.probe_new = chipone_i2c_probe,
+	.probe = chipone_i2c_probe,
 	.id_table = chipone_i2c_id,
 	.driver = {
 		.name = "chipone-icn6211-i2c",
diff --git a/drivers/gpu/drm/bridge/chrontel-ch7033.c b/drivers/gpu/drm/bridge/chrontel-ch7033.c
index 339b759e4c81..a854eb84e399 100644
--- a/drivers/gpu/drm/bridge/chrontel-ch7033.c
+++ b/drivers/gpu/drm/bridge/chrontel-ch7033.c
@@ -603,7 +603,7 @@  static const struct i2c_device_id ch7033_ids[] = {
 MODULE_DEVICE_TABLE(i2c, ch7033_ids);
 
 static struct i2c_driver ch7033_driver = {
-	.probe_new = ch7033_probe,
+	.probe = ch7033_probe,
 	.remove = ch7033_remove,
 	.driver = {
 		.name = "ch7033",
diff --git a/drivers/gpu/drm/bridge/cros-ec-anx7688.c b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
index fa91bdeddef0..c8abd9920fee 100644
--- a/drivers/gpu/drm/bridge/cros-ec-anx7688.c
+++ b/drivers/gpu/drm/bridge/cros-ec-anx7688.c
@@ -173,7 +173,7 @@  static const struct of_device_id cros_ec_anx7688_bridge_match_table[] = {
 MODULE_DEVICE_TABLE(of, cros_ec_anx7688_bridge_match_table);
 
 static struct i2c_driver cros_ec_anx7688_bridge_driver = {
-	.probe_new = cros_ec_anx7688_bridge_probe,
+	.probe = cros_ec_anx7688_bridge_probe,
 	.remove = cros_ec_anx7688_bridge_remove,
 	.driver = {
 		.name = "cros-ec-anx7688-bridge",
diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
index abaf6e23775e..a4cc51cf6e06 100644
--- a/drivers/gpu/drm/bridge/ite-it6505.c
+++ b/drivers/gpu/drm/bridge/ite-it6505.c
@@ -3478,7 +3478,7 @@  static struct i2c_driver it6505_i2c_driver = {
 		.of_match_table = it6505_of_match,
 		.pm = &it6505_bridge_pm_ops,
 	},
-	.probe_new = it6505_i2c_probe,
+	.probe = it6505_i2c_probe,
 	.remove = it6505_i2c_remove,
 	.shutdown = it6505_shutdown,
 	.id_table = it6505_id,
diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
index a2d723d6a4be..466641c77fe9 100644
--- a/drivers/gpu/drm/bridge/ite-it66121.c
+++ b/drivers/gpu/drm/bridge/ite-it66121.c
@@ -1640,7 +1640,7 @@  static struct i2c_driver it66121_driver = {
 		.name	= "it66121",
 		.of_match_table = it66121_dt_match,
 	},
-	.probe_new = it66121_probe,
+	.probe = it66121_probe,
 	.remove = it66121_remove,
 	.id_table = it66121_id,
 };
diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c
index 13c131ade268..4eaea67fb71c 100644
--- a/drivers/gpu/drm/bridge/lontium-lt8912b.c
+++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c
@@ -773,7 +773,7 @@  static struct i2c_driver lt8912_i2c_driver = {
 		.name = "lt8912",
 		.of_match_table = lt8912_dt_match,
 	},
-	.probe_new = lt8912_probe,
+	.probe = lt8912_probe,
 	.remove = lt8912_remove,
 	.id_table = lt8912_id,
 };
diff --git a/drivers/gpu/drm/bridge/lontium-lt9211.c b/drivers/gpu/drm/bridge/lontium-lt9211.c
index 3e19fff6547a..0ab7c07c2c84 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9211.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9211.c
@@ -785,7 +785,7 @@  static const struct of_device_id lt9211_match_table[] = {
 MODULE_DEVICE_TABLE(of, lt9211_match_table);
 
 static struct i2c_driver lt9211_driver = {
-	.probe_new = lt9211_probe,
+	.probe = lt9211_probe,
 	.remove = lt9211_remove,
 	.id_table = lt9211_id,
 	.driver = {
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
index a25d21a7d5c1..9663601ce098 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
@@ -1190,7 +1190,7 @@  static struct i2c_driver lt9611_driver = {
 		.name = "lt9611",
 		.of_match_table = lt9611_match_table,
 	},
-	.probe_new = lt9611_probe,
+	.probe = lt9611_probe,
 	.remove = lt9611_remove,
 	.id_table = lt9611_id,
 };
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index 583daacf3705..2a57e804ea02 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
@@ -1011,7 +1011,7 @@  static struct i2c_driver lt9611uxc_driver = {
 		.of_match_table = lt9611uxc_match_table,
 		.dev_groups = lt9611uxc_attr_groups,
 	},
-	.probe_new = lt9611uxc_probe,
+	.probe = lt9611uxc_probe,
 	.remove = lt9611uxc_remove,
 	.id_table = lt9611uxc_id,
 };
diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index 4fc494d9084b..460db3c8a08c 100644
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -375,7 +375,7 @@  MODULE_DEVICE_TABLE(of, stdp4028_ge_b850v3_fw_match);
 
 static struct i2c_driver stdp4028_ge_b850v3_fw_driver = {
 	.id_table	= stdp4028_ge_b850v3_fw_i2c_table,
-	.probe_new	= stdp4028_ge_b850v3_fw_probe,
+	.probe		= stdp4028_ge_b850v3_fw_probe,
 	.remove		= stdp4028_ge_b850v3_fw_remove,
 	.driver		= {
 		.name		= "stdp4028-ge-b850v3-fw",
@@ -422,7 +422,7 @@  MODULE_DEVICE_TABLE(of, stdp2690_ge_b850v3_fw_match);
 
 static struct i2c_driver stdp2690_ge_b850v3_fw_driver = {
 	.id_table	= stdp2690_ge_b850v3_fw_i2c_table,
-	.probe_new	= stdp2690_ge_b850v3_fw_probe,
+	.probe		= stdp2690_ge_b850v3_fw_probe,
 	.remove		= stdp2690_ge_b850v3_fw_remove,
 	.driver		= {
 		.name		= "stdp2690-ge-b850v3-fw",
diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index cd292a2f894c..d81920227a8a 100644
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -335,7 +335,7 @@  MODULE_DEVICE_TABLE(of, ptn3460_match);
 
 static struct i2c_driver ptn3460_driver = {
 	.id_table	= ptn3460_i2c_table,
-	.probe_new	= ptn3460_probe,
+	.probe		= ptn3460_probe,
 	.remove		= ptn3460_remove,
 	.driver		= {
 		.name	= "nxp,ptn3460",
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
index efa80e309b98..c9b6cb7678e3 100644
--- a/drivers/gpu/drm/bridge/parade-ps8622.c
+++ b/drivers/gpu/drm/bridge/parade-ps8622.c
@@ -538,7 +538,7 @@  MODULE_DEVICE_TABLE(i2c, ps8622_i2c_table);
 
 static struct i2c_driver ps8622_driver = {
 	.id_table	= ps8622_i2c_table,
-	.probe_new	= ps8622_probe,
+	.probe		= ps8622_probe,
 	.remove		= ps8622_remove,
 	.driver		= {
 		.name	= "ps8622",
diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
index c3eb45179405..8801cdd033b5 100644
--- a/drivers/gpu/drm/bridge/parade-ps8640.c
+++ b/drivers/gpu/drm/bridge/parade-ps8640.c
@@ -791,7 +791,7 @@  static const struct of_device_id ps8640_match[] = {
 MODULE_DEVICE_TABLE(of, ps8640_match);
 
 static struct i2c_driver ps8640_driver = {
-	.probe_new = ps8640_probe,
+	.probe = ps8640_probe,
 	.remove = ps8640_remove,
 	.driver = {
 		.name = "ps8640",
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index ef66461e7f7c..aac239729a1d 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -1151,7 +1151,7 @@  static const struct i2c_device_id sii902x_i2c_ids[] = {
 MODULE_DEVICE_TABLE(i2c, sii902x_i2c_ids);
 
 static struct i2c_driver sii902x_driver = {
-	.probe_new = sii902x_probe,
+	.probe = sii902x_probe,
 	.remove = sii902x_remove,
 	.driver = {
 		.name = "sii902x",
diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
index 2d17f227867b..d8373d918324 100644
--- a/drivers/gpu/drm/bridge/sii9234.c
+++ b/drivers/gpu/drm/bridge/sii9234.c
@@ -955,7 +955,7 @@  static struct i2c_driver sii9234_driver = {
 		.name	= "sii9234",
 		.of_match_table = sii9234_dt_match,
 	},
-	.probe_new = sii9234_probe,
+	.probe = sii9234_probe,
 	.remove = sii9234_remove,
 	.id_table = sii9234_id,
 };
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
index b96d03cd878d..79b09ccd1353 100644
--- a/drivers/gpu/drm/bridge/sil-sii8620.c
+++ b/drivers/gpu/drm/bridge/sil-sii8620.c
@@ -2378,7 +2378,7 @@  static struct i2c_driver sii8620_driver = {
 		.name	= "sii8620",
 		.of_match_table = of_match_ptr(sii8620_dt_match),
 	},
-	.probe_new	= sii8620_probe,
+	.probe		= sii8620_probe,
 	.remove		= sii8620_remove,
 	.id_table = sii8620_id,
 };
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index 91f7cb56a654..4dcf899715ac 100644
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -2209,7 +2209,7 @@  static struct i2c_driver tc358767_driver = {
 		.of_match_table = tc358767_of_ids,
 	},
 	.id_table = tc358767_i2c_ids,
-	.probe_new = tc_probe,
+	.probe = tc_probe,
 	.remove	= tc_remove,
 };
 module_i2c_driver(tc358767_driver);
diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c
index 7c0cbe84611b..783c3fd896ca 100644
--- a/drivers/gpu/drm/bridge/tc358768.c
+++ b/drivers/gpu/drm/bridge/tc358768.c
@@ -1083,7 +1083,7 @@  static struct i2c_driver tc358768_driver = {
 		.of_match_table = tc358768_of_ids,
 	},
 	.id_table = tc358768_i2c_ids,
-	.probe_new = tc358768_i2c_probe,
+	.probe = tc358768_i2c_probe,
 	.remove	= tc358768_i2c_remove,
 };
 module_i2c_driver(tc358768_driver);
diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc358775.c
index 19316994ddd1..90a89d70d832 100644
--- a/drivers/gpu/drm/bridge/tc358775.c
+++ b/drivers/gpu/drm/bridge/tc358775.c
@@ -728,7 +728,7 @@  static struct i2c_driver tc358775_driver = {
 		.of_match_table = tc358775_of_ids,
 	},
 	.id_table = tc358775_i2c_ids,
-	.probe_new = tc_probe,
+	.probe = tc_probe,
 	.remove	= tc_remove,
 };
 module_i2c_driver(tc358775_driver);
diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
index 186a9e2ff24d..b65632ec7e7d 100644
--- a/drivers/gpu/drm/bridge/ti-dlpc3433.c
+++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
@@ -400,7 +400,7 @@  static const struct of_device_id dlpc3433_match_table[] = {
 MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
 
 static struct i2c_driver dlpc3433_driver = {
-	.probe_new = dlpc3433_probe,
+	.probe = dlpc3433_probe,
 	.remove = dlpc3433_remove,
 	.id_table = dlpc3433_id,
 	.driver = {
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
index 75286c9afbb9..e26a8acb9f6b 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
@@ -734,7 +734,7 @@  static const struct of_device_id sn65dsi83_match_table[] = {
 MODULE_DEVICE_TABLE(of, sn65dsi83_match_table);
 
 static struct i2c_driver sn65dsi83_driver = {
-	.probe_new = sn65dsi83_probe,
+	.probe = sn65dsi83_probe,
 	.remove = sn65dsi83_remove,
 	.id_table = sn65dsi83_id,
 	.driver = {
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index 7a748785c545..62ec377f2183 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -1951,7 +1951,7 @@  static struct i2c_driver ti_sn65dsi86_driver = {
 		.of_match_table = ti_sn65dsi86_match_table,
 		.pm = &ti_sn65dsi86_pm_ops,
 	},
-	.probe_new = ti_sn65dsi86_probe,
+	.probe = ti_sn65dsi86_probe,
 	.id_table = ti_sn65dsi86_id,
 };
 
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index ab63225cd635..c06390da9ffd 100644
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -408,7 +408,7 @@  static struct i2c_driver tfp410_i2c_driver = {
 		.of_match_table = of_match_ptr(tfp410_match),
 	},
 	.id_table	= tfp410_i2c_ids,
-	.probe_new	= tfp410_i2c_probe,
+	.probe		= tfp410_i2c_probe,
 	.remove		= tfp410_i2c_remove,
 };
 #endif /* IS_ENABLED(CONFIG_I2C) */
diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c
index b8c143e573e0..82d618c40dce 100644
--- a/drivers/gpu/drm/i2c/tda9950.c
+++ b/drivers/gpu/drm/i2c/tda9950.c
@@ -492,7 +492,7 @@  static struct i2c_device_id tda9950_ids[] = {
 MODULE_DEVICE_TABLE(i2c, tda9950_ids);
 
 static struct i2c_driver tda9950_driver = {
-	.probe_new = tda9950_probe,
+	.probe = tda9950_probe,
 	.remove = tda9950_remove,
 	.driver = {
 		.name = "tda9950",
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index db5c9343a3d2..40bcd9067e69 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -2099,7 +2099,7 @@  static const struct i2c_device_id tda998x_ids[] = {
 MODULE_DEVICE_TABLE(i2c, tda998x_ids);
 
 static struct i2c_driver tda998x_driver = {
-	.probe_new = tda998x_probe,
+	.probe = tda998x_probe,
 	.remove = tda998x_remove,
 	.driver = {
 		.name = "tda998x",
diff --git a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
index aba556c98300..4819ada69482 100644
--- a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+++ b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
@@ -308,7 +308,7 @@  static struct i2c_driver lcd_olinuxino_driver = {
 		.name = "lcd_olinuxino",
 		.of_match_table = lcd_olinuxino_of_ids,
 	},
-	.probe_new = lcd_olinuxino_probe,
+	.probe = lcd_olinuxino_probe,
 	.remove = lcd_olinuxino_remove,
 };
 
diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
index 11d6ca276c1e..90ea91e4311d 100644
--- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
@@ -489,7 +489,7 @@  static struct i2c_driver rpi_touchscreen_driver = {
 		.name = "rpi_touchscreen",
 		.of_match_table = rpi_touchscreen_of_ids,
 	},
-	.probe_new = rpi_touchscreen_probe,
+	.probe = rpi_touchscreen_probe,
 	.remove = rpi_touchscreen_remove,
 };
 
diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomon/ssd130x-i2c.c
index ddfa0bb5d9c9..b4eb2d64bf6e 100644
--- a/drivers/gpu/drm/solomon/ssd130x-i2c.c
+++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c
@@ -100,7 +100,7 @@  static struct i2c_driver ssd130x_i2c_driver = {
 		.name = DRIVER_NAME,
 		.of_match_table = ssd130x_of_match,
 	},
-	.probe_new = ssd130x_i2c_probe,
+	.probe = ssd130x_i2c_probe,
 	.remove = ssd130x_i2c_remove,
 	.shutdown = ssd130x_i2c_shutdown,
 };