drm: Switch i2c drivers back to use .probe()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 26 May 2023 09:07:09 +0000 (11:07 +0200)
committerDouglas Anderson <dianders@chromium.org>
Tue, 30 May 2023 23:55:16 +0000 (16:55 -0700)
After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert
back to (the new) .probe() to be able to eventually drop .probe_new() from
struct i2c_driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Martyn Welch <martyn.welch@collabora.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230526090709.1517297-1-u.kleine-koenig@pengutronix.de
32 files changed:
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
drivers/gpu/drm/bridge/analogix/anx7625.c
drivers/gpu/drm/bridge/chipone-icn6211.c
drivers/gpu/drm/bridge/chrontel-ch7033.c
drivers/gpu/drm/bridge/cros-ec-anx7688.c
drivers/gpu/drm/bridge/ite-it6505.c
drivers/gpu/drm/bridge/ite-it66121.c
drivers/gpu/drm/bridge/lontium-lt8912b.c
drivers/gpu/drm/bridge/lontium-lt9211.c
drivers/gpu/drm/bridge/lontium-lt9611.c
drivers/gpu/drm/bridge/lontium-lt9611uxc.c
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
drivers/gpu/drm/bridge/nxp-ptn3460.c
drivers/gpu/drm/bridge/parade-ps8622.c
drivers/gpu/drm/bridge/parade-ps8640.c
drivers/gpu/drm/bridge/sii902x.c
drivers/gpu/drm/bridge/sii9234.c
drivers/gpu/drm/bridge/sil-sii8620.c
drivers/gpu/drm/bridge/tc358767.c
drivers/gpu/drm/bridge/tc358768.c
drivers/gpu/drm/bridge/tc358775.c
drivers/gpu/drm/bridge/ti-dlpc3433.c
drivers/gpu/drm/bridge/ti-sn65dsi83.c
drivers/gpu/drm/bridge/ti-sn65dsi86.c
drivers/gpu/drm/bridge/ti-tfp410.c
drivers/gpu/drm/i2c/tda9950.c
drivers/gpu/drm/i2c/tda998x_drv.c
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
drivers/gpu/drm/solomon/ssd130x-i2c.c

index ddceafa..2254457 100644 (file)
@@ -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,
 };
 
index 3577c53..72ab2ab 100644 (file)
@@ -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,
 };
index a3a38bb..06a3e32 100644 (file)
@@ -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,
 };
index c86531f..8b985ef 100644 (file)
@@ -2800,7 +2800,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,
index 0e37840..8bfce21 100644 (file)
@@ -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",
index 339b759..a854eb8 100644 (file)
@@ -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",
index fa91bde..c8abd99 100644 (file)
@@ -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",
index 45f579c..504d51c 100644 (file)
@@ -3479,7 +3479,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,
index a2d723d..466641c 100644 (file)
@@ -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,
 };
index 13c131a..4eaea67 100644 (file)
@@ -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,
 };
index 00db681..aa8d47e 100644 (file)
@@ -787,7 +787,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 = {
index 151efe9..5163e52 100644 (file)
@@ -1192,7 +1192,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,
 };
index 583daac..2a57e80 100644 (file)
@@ -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,
 };
index 4fc494d..460db3c 100644 (file)
@@ -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",
index cd292a2..d819202 100644 (file)
@@ -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",
index efa80e3..c9b6cb7 100644 (file)
@@ -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",
index c3eb451..8801cdd 100644 (file)
@@ -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",
index ef66461..aac2397 100644 (file)
@@ -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",
index 2d17f22..d8373d9 100644 (file)
@@ -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,
 };
index b96d03c..79b09cc 100644 (file)
@@ -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,
 };
index 9db0e02..65dc842 100644 (file)
@@ -2402,7 +2402,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);
index 97ae3a9..819a4b6 100644 (file)
@@ -1134,7 +1134,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);
index 1931699..90a89d7 100644 (file)
@@ -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);
index 186a9e2..b65632e 100644 (file)
@@ -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 = {
index 6e125ba..7e9f4ec 100644 (file)
@@ -748,7 +748,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 = {
index 260cad1..597ceb7 100644 (file)
@@ -1970,7 +1970,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,
 };
 
index ab63225..c06390d 100644 (file)
@@ -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) */
index b8c143e..82d618c 100644 (file)
@@ -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",
index db5c934..40bcd90 100644 (file)
@@ -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",
index aba556c..4819ada 100644 (file)
@@ -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,
 };
 
index 11d6ca2..90ea91e 100644 (file)
@@ -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,
 };
 
index ddfa0bb..b4eb2d6 100644 (file)
@@ -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,
 };