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

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

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index ddceafa7b637419f557e982e9d727ac61fd9ad59..2254457ab5d0234956b3d6bc59eed230cbc8a71a 100644 (file)
--- 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 3577c532abb4e3de1b6ea222ea928ed550ee3275..72ab2ab7708193ce732721d137fd293b2d528a8c 100644 (file)
--- 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 a3a38bbe27860c56d5f87c16a19438b17d64773d..06a3e3243e19ef8f3246763f5be19656f4459f9c 100644 (file)
--- 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 c86531f7b072641238ebb4421443bd019507061b..8b985efdc086bed06313c0e613dce6ccf2f0f4f9 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -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,

diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
index 0e37840cd7a87c2e71accb376882380fd5799af3..8bfce21d6b90048b204483d4ccae4f9205401a8a 100644 (file)
--- 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 339b759e4c8131c5bf6e657861a1e57f1734b6ca..a854eb84e39919d34e14759c3fdc1bde8abfcfae 100644 (file)
--- 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 fa91bdeddef069c95ced5c68ac86136d714b5907..c8abd9920fee956cf049bcb09827d658b7939333 100644 (file)
--- 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 45f579c365e7f49f2d3f50f77eb6595e7b8bf274..504d51c42f798194423e08d43ce35f5df9b77334 100644 (file)
--- a/drivers/gpu/drm/bridge/ite-it6505.c
+++ b/drivers/gpu/drm/bridge/ite-it6505.c
@@ -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,

diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
index a2d723d6a4be84bbebb2e3917e35c9bbe9e008e1..466641c77fe91192348db62c8bd4f478fff9c250 100644 (file)
--- 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 13c131ade268360b66b310ef78fbb154bd34c023..4eaea67fb71c20171c6468dfee3ed181356d2365 100644 (file)
--- 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 00db681512385b6d239c3c6d4e430ded70194ea6..aa8d47e7f40da71aa6d3d62bb00b20adda9459ae 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt9211.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9211.c
@@ -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 = {

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
index 151efe92711c4304d8711bc377559d3cf481a3e7..5163e5224aad71960f4ec09dad797e0466b89313 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
@@ -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,
 };

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index 583daacf3705411ed94911da0a32c1c1a94f60ec..2a57e804ea020c4df29780eb1a95d1dfb9ea1932 100644 (file)
--- 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 4fc494d9084b74553436020dc32f1bd8612dbee6..460db3c8a08cc5d3bc799e3a5460b705670b3c57 100644 (file)
--- 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 cd292a2f894cad3f193403c7a0e8a201b4438bb4..d81920227a8aeb293b1dfbd20403a17545b01ba1 100644 (file)
--- 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 efa80e309b9882c265d449c708fe84ab20003924..c9b6cb7678e332024122b8e05b32a3deedd18dd8 100644 (file)
--- 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 c3eb45179405c3e19167e954862a63e8f135fdfa..8801cdd033b5e40e727274f0d581780121107976 100644 (file)
--- 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 ef66461e7f7c4cf6d892af361a84b510ae203086..aac239729a1d0ece4d201f50f4fa51156d8fb943 100644 (file)
--- 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 2d17f227867bce77e25925da8be0a0709a456f68..d8373d91832423ecfe1ca9edfd5dc7fbc73e8ade 100644 (file)
--- 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 b96d03cd878d95637140c23a597bb5e70a7fa3cf..79b09ccd13533f69d6f2f8544d27977b5963f279 100644 (file)
--- 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 9db0e0231e0395ff175ce8ddaa43cff8cc5652a1..65dc842e31f014554faefc1cbf680ef440d5a442 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -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);

diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c
index 97ae3a9c90daa8c3142de8150550e6f3ef1d6f75..819a4b6ec2a07fe559ffd76a284e2765716d075d 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358768.c
+++ b/drivers/gpu/drm/bridge/tc358768.c
@@ -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);

diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc358775.c
index 19316994ddd11412e8202c37fde6190304e53a06..90a89d70d83287948dbdcf9425fd657f2fe6668c 100644 (file)
--- 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 186a9e2ff24dc76e37354c4214ffb4976eac0847..b65632ec7e7daa436a4e1d5e71028384bb65b900 100644 (file)
--- 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 6e125ba4f0d754bc63086c8fdbc7d219d55c6aaa..7e9f4ec8e780ac9b6a5e5f97743398c3826ed79a 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
@@ -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 = {

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index 260cad1fd1da391bd5e21736c97cdf0d4c57a401..597ceb7024e0ea9baff44791e47a07ca32230a13 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -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,
 };
 

diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index ab63225cd6350568fe9b625d7802488115fdc262..c06390da9ffd03f392f2be30b8070564a4f478cd 100644 (file)
--- 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 b8c143e573e0bb1bdf1f01f0560e1cddc2c3ce58..82d618c40dceacba2e98210e5b538ae6b9306b11 100644 (file)
--- 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 db5c9343a3d20d8bdf8d73c174f6b9a33dd8cf08..40bcd9067e69d036cb29160d01ac152e396d45f0 100644 (file)
--- 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 aba556c98300b3b2877438b42dc6de8427be051d..4819ada694826887f9499fffac2f6afa132b3b85 100644 (file)
--- 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 11d6ca276c1e767cfb977a3326a6b5f8df3ace42..90ea91e4311d44b9a079ed9b5d3289b2b0c7dbe9 100644 (file)
--- 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 ddfa0bb5d9c9762cc5543922a82a93ef809b0c03..b4eb2d64bf6e01a9e863b9bb939c07b0daeb8e96 100644 (file)
--- 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,
 };