Commit 332af828 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Douglas Anderson

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

After commit b8a1a4cd ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f4 ("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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarKieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarMartyn Welch <martyn.welch@collabora.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230526090709.1517297-1-u.kleine-koenig@pengutronix.de
parent 5769b45a
...@@ -1393,7 +1393,7 @@ static struct i2c_driver adv7511_driver = { ...@@ -1393,7 +1393,7 @@ static struct i2c_driver adv7511_driver = {
.of_match_table = adv7511_of_ids, .of_match_table = adv7511_of_ids,
}, },
.id_table = adv7511_i2c_ids, .id_table = adv7511_i2c_ids,
.probe_new = adv7511_probe, .probe = adv7511_probe,
.remove = adv7511_remove, .remove = adv7511_remove,
}; };
......
...@@ -815,7 +815,7 @@ static struct i2c_driver anx6345_driver = { ...@@ -815,7 +815,7 @@ static struct i2c_driver anx6345_driver = {
.name = "anx6345", .name = "anx6345",
.of_match_table = of_match_ptr(anx6345_match_table), .of_match_table = of_match_ptr(anx6345_match_table),
}, },
.probe_new = anx6345_i2c_probe, .probe = anx6345_i2c_probe,
.remove = anx6345_i2c_remove, .remove = anx6345_i2c_remove,
.id_table = anx6345_id, .id_table = anx6345_id,
}; };
......
...@@ -1389,7 +1389,7 @@ static struct i2c_driver anx78xx_driver = { ...@@ -1389,7 +1389,7 @@ static struct i2c_driver anx78xx_driver = {
.name = "anx7814", .name = "anx7814",
.of_match_table = of_match_ptr(anx78xx_match_table), .of_match_table = of_match_ptr(anx78xx_match_table),
}, },
.probe_new = anx78xx_i2c_probe, .probe = anx78xx_i2c_probe,
.remove = anx78xx_i2c_remove, .remove = anx78xx_i2c_remove,
.id_table = anx78xx_id, .id_table = anx78xx_id,
}; };
......
...@@ -2800,7 +2800,7 @@ static struct i2c_driver anx7625_driver = { ...@@ -2800,7 +2800,7 @@ static struct i2c_driver anx7625_driver = {
.of_match_table = anx_match_table, .of_match_table = anx_match_table,
.pm = &anx7625_pm_ops, .pm = &anx7625_pm_ops,
}, },
.probe_new = anx7625_i2c_probe, .probe = anx7625_i2c_probe,
.remove = anx7625_i2c_remove, .remove = anx7625_i2c_remove,
.id_table = anx7625_id, .id_table = anx7625_id,
......
...@@ -795,7 +795,7 @@ static struct i2c_device_id chipone_i2c_id[] = { ...@@ -795,7 +795,7 @@ static struct i2c_device_id chipone_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, chipone_i2c_id); MODULE_DEVICE_TABLE(i2c, chipone_i2c_id);
static struct i2c_driver chipone_i2c_driver = { static struct i2c_driver chipone_i2c_driver = {
.probe_new = chipone_i2c_probe, .probe = chipone_i2c_probe,
.id_table = chipone_i2c_id, .id_table = chipone_i2c_id,
.driver = { .driver = {
.name = "chipone-icn6211-i2c", .name = "chipone-icn6211-i2c",
......
...@@ -603,7 +603,7 @@ static const struct i2c_device_id ch7033_ids[] = { ...@@ -603,7 +603,7 @@ static const struct i2c_device_id ch7033_ids[] = {
MODULE_DEVICE_TABLE(i2c, ch7033_ids); MODULE_DEVICE_TABLE(i2c, ch7033_ids);
static struct i2c_driver ch7033_driver = { static struct i2c_driver ch7033_driver = {
.probe_new = ch7033_probe, .probe = ch7033_probe,
.remove = ch7033_remove, .remove = ch7033_remove,
.driver = { .driver = {
.name = "ch7033", .name = "ch7033",
......
...@@ -173,7 +173,7 @@ static const struct of_device_id cros_ec_anx7688_bridge_match_table[] = { ...@@ -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); MODULE_DEVICE_TABLE(of, cros_ec_anx7688_bridge_match_table);
static struct i2c_driver cros_ec_anx7688_bridge_driver = { 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, .remove = cros_ec_anx7688_bridge_remove,
.driver = { .driver = {
.name = "cros-ec-anx7688-bridge", .name = "cros-ec-anx7688-bridge",
......
...@@ -3479,7 +3479,7 @@ static struct i2c_driver it6505_i2c_driver = { ...@@ -3479,7 +3479,7 @@ static struct i2c_driver it6505_i2c_driver = {
.of_match_table = it6505_of_match, .of_match_table = it6505_of_match,
.pm = &it6505_bridge_pm_ops, .pm = &it6505_bridge_pm_ops,
}, },
.probe_new = it6505_i2c_probe, .probe = it6505_i2c_probe,
.remove = it6505_i2c_remove, .remove = it6505_i2c_remove,
.shutdown = it6505_shutdown, .shutdown = it6505_shutdown,
.id_table = it6505_id, .id_table = it6505_id,
......
...@@ -1640,7 +1640,7 @@ static struct i2c_driver it66121_driver = { ...@@ -1640,7 +1640,7 @@ static struct i2c_driver it66121_driver = {
.name = "it66121", .name = "it66121",
.of_match_table = it66121_dt_match, .of_match_table = it66121_dt_match,
}, },
.probe_new = it66121_probe, .probe = it66121_probe,
.remove = it66121_remove, .remove = it66121_remove,
.id_table = it66121_id, .id_table = it66121_id,
}; };
......
...@@ -773,7 +773,7 @@ static struct i2c_driver lt8912_i2c_driver = { ...@@ -773,7 +773,7 @@ static struct i2c_driver lt8912_i2c_driver = {
.name = "lt8912", .name = "lt8912",
.of_match_table = lt8912_dt_match, .of_match_table = lt8912_dt_match,
}, },
.probe_new = lt8912_probe, .probe = lt8912_probe,
.remove = lt8912_remove, .remove = lt8912_remove,
.id_table = lt8912_id, .id_table = lt8912_id,
}; };
......
...@@ -787,7 +787,7 @@ static const struct of_device_id lt9211_match_table[] = { ...@@ -787,7 +787,7 @@ static const struct of_device_id lt9211_match_table[] = {
MODULE_DEVICE_TABLE(of, lt9211_match_table); MODULE_DEVICE_TABLE(of, lt9211_match_table);
static struct i2c_driver lt9211_driver = { static struct i2c_driver lt9211_driver = {
.probe_new = lt9211_probe, .probe = lt9211_probe,
.remove = lt9211_remove, .remove = lt9211_remove,
.id_table = lt9211_id, .id_table = lt9211_id,
.driver = { .driver = {
......
...@@ -1192,7 +1192,7 @@ static struct i2c_driver lt9611_driver = { ...@@ -1192,7 +1192,7 @@ static struct i2c_driver lt9611_driver = {
.name = "lt9611", .name = "lt9611",
.of_match_table = lt9611_match_table, .of_match_table = lt9611_match_table,
}, },
.probe_new = lt9611_probe, .probe = lt9611_probe,
.remove = lt9611_remove, .remove = lt9611_remove,
.id_table = lt9611_id, .id_table = lt9611_id,
}; };
......
...@@ -1011,7 +1011,7 @@ static struct i2c_driver lt9611uxc_driver = { ...@@ -1011,7 +1011,7 @@ static struct i2c_driver lt9611uxc_driver = {
.of_match_table = lt9611uxc_match_table, .of_match_table = lt9611uxc_match_table,
.dev_groups = lt9611uxc_attr_groups, .dev_groups = lt9611uxc_attr_groups,
}, },
.probe_new = lt9611uxc_probe, .probe = lt9611uxc_probe,
.remove = lt9611uxc_remove, .remove = lt9611uxc_remove,
.id_table = lt9611uxc_id, .id_table = lt9611uxc_id,
}; };
......
...@@ -375,7 +375,7 @@ MODULE_DEVICE_TABLE(of, stdp4028_ge_b850v3_fw_match); ...@@ -375,7 +375,7 @@ MODULE_DEVICE_TABLE(of, stdp4028_ge_b850v3_fw_match);
static struct i2c_driver stdp4028_ge_b850v3_fw_driver = { static struct i2c_driver stdp4028_ge_b850v3_fw_driver = {
.id_table = stdp4028_ge_b850v3_fw_i2c_table, .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, .remove = stdp4028_ge_b850v3_fw_remove,
.driver = { .driver = {
.name = "stdp4028-ge-b850v3-fw", .name = "stdp4028-ge-b850v3-fw",
...@@ -422,7 +422,7 @@ MODULE_DEVICE_TABLE(of, stdp2690_ge_b850v3_fw_match); ...@@ -422,7 +422,7 @@ MODULE_DEVICE_TABLE(of, stdp2690_ge_b850v3_fw_match);
static struct i2c_driver stdp2690_ge_b850v3_fw_driver = { static struct i2c_driver stdp2690_ge_b850v3_fw_driver = {
.id_table = stdp2690_ge_b850v3_fw_i2c_table, .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, .remove = stdp2690_ge_b850v3_fw_remove,
.driver = { .driver = {
.name = "stdp2690-ge-b850v3-fw", .name = "stdp2690-ge-b850v3-fw",
......
...@@ -335,7 +335,7 @@ MODULE_DEVICE_TABLE(of, ptn3460_match); ...@@ -335,7 +335,7 @@ MODULE_DEVICE_TABLE(of, ptn3460_match);
static struct i2c_driver ptn3460_driver = { static struct i2c_driver ptn3460_driver = {
.id_table = ptn3460_i2c_table, .id_table = ptn3460_i2c_table,
.probe_new = ptn3460_probe, .probe = ptn3460_probe,
.remove = ptn3460_remove, .remove = ptn3460_remove,
.driver = { .driver = {
.name = "nxp,ptn3460", .name = "nxp,ptn3460",
......
...@@ -538,7 +538,7 @@ MODULE_DEVICE_TABLE(i2c, ps8622_i2c_table); ...@@ -538,7 +538,7 @@ MODULE_DEVICE_TABLE(i2c, ps8622_i2c_table);
static struct i2c_driver ps8622_driver = { static struct i2c_driver ps8622_driver = {
.id_table = ps8622_i2c_table, .id_table = ps8622_i2c_table,
.probe_new = ps8622_probe, .probe = ps8622_probe,
.remove = ps8622_remove, .remove = ps8622_remove,
.driver = { .driver = {
.name = "ps8622", .name = "ps8622",
......
...@@ -791,7 +791,7 @@ static const struct of_device_id ps8640_match[] = { ...@@ -791,7 +791,7 @@ static const struct of_device_id ps8640_match[] = {
MODULE_DEVICE_TABLE(of, ps8640_match); MODULE_DEVICE_TABLE(of, ps8640_match);
static struct i2c_driver ps8640_driver = { static struct i2c_driver ps8640_driver = {
.probe_new = ps8640_probe, .probe = ps8640_probe,
.remove = ps8640_remove, .remove = ps8640_remove,
.driver = { .driver = {
.name = "ps8640", .name = "ps8640",
......
...@@ -1151,7 +1151,7 @@ static const struct i2c_device_id sii902x_i2c_ids[] = { ...@@ -1151,7 +1151,7 @@ static const struct i2c_device_id sii902x_i2c_ids[] = {
MODULE_DEVICE_TABLE(i2c, sii902x_i2c_ids); MODULE_DEVICE_TABLE(i2c, sii902x_i2c_ids);
static struct i2c_driver sii902x_driver = { static struct i2c_driver sii902x_driver = {
.probe_new = sii902x_probe, .probe = sii902x_probe,
.remove = sii902x_remove, .remove = sii902x_remove,
.driver = { .driver = {
.name = "sii902x", .name = "sii902x",
......
...@@ -955,7 +955,7 @@ static struct i2c_driver sii9234_driver = { ...@@ -955,7 +955,7 @@ static struct i2c_driver sii9234_driver = {
.name = "sii9234", .name = "sii9234",
.of_match_table = sii9234_dt_match, .of_match_table = sii9234_dt_match,
}, },
.probe_new = sii9234_probe, .probe = sii9234_probe,
.remove = sii9234_remove, .remove = sii9234_remove,
.id_table = sii9234_id, .id_table = sii9234_id,
}; };
......
...@@ -2378,7 +2378,7 @@ static struct i2c_driver sii8620_driver = { ...@@ -2378,7 +2378,7 @@ static struct i2c_driver sii8620_driver = {
.name = "sii8620", .name = "sii8620",
.of_match_table = of_match_ptr(sii8620_dt_match), .of_match_table = of_match_ptr(sii8620_dt_match),
}, },
.probe_new = sii8620_probe, .probe = sii8620_probe,
.remove = sii8620_remove, .remove = sii8620_remove,
.id_table = sii8620_id, .id_table = sii8620_id,
}; };
......
...@@ -2402,7 +2402,7 @@ static struct i2c_driver tc358767_driver = { ...@@ -2402,7 +2402,7 @@ static struct i2c_driver tc358767_driver = {
.of_match_table = tc358767_of_ids, .of_match_table = tc358767_of_ids,
}, },
.id_table = tc358767_i2c_ids, .id_table = tc358767_i2c_ids,
.probe_new = tc_probe, .probe = tc_probe,
.remove = tc_remove, .remove = tc_remove,
}; };
module_i2c_driver(tc358767_driver); module_i2c_driver(tc358767_driver);
......
...@@ -1134,7 +1134,7 @@ static struct i2c_driver tc358768_driver = { ...@@ -1134,7 +1134,7 @@ static struct i2c_driver tc358768_driver = {
.of_match_table = tc358768_of_ids, .of_match_table = tc358768_of_ids,
}, },
.id_table = tc358768_i2c_ids, .id_table = tc358768_i2c_ids,
.probe_new = tc358768_i2c_probe, .probe = tc358768_i2c_probe,
.remove = tc358768_i2c_remove, .remove = tc358768_i2c_remove,
}; };
module_i2c_driver(tc358768_driver); module_i2c_driver(tc358768_driver);
......
...@@ -728,7 +728,7 @@ static struct i2c_driver tc358775_driver = { ...@@ -728,7 +728,7 @@ static struct i2c_driver tc358775_driver = {
.of_match_table = tc358775_of_ids, .of_match_table = tc358775_of_ids,
}, },
.id_table = tc358775_i2c_ids, .id_table = tc358775_i2c_ids,
.probe_new = tc_probe, .probe = tc_probe,
.remove = tc_remove, .remove = tc_remove,
}; };
module_i2c_driver(tc358775_driver); module_i2c_driver(tc358775_driver);
......
...@@ -400,7 +400,7 @@ static const struct of_device_id dlpc3433_match_table[] = { ...@@ -400,7 +400,7 @@ static const struct of_device_id dlpc3433_match_table[] = {
MODULE_DEVICE_TABLE(of, dlpc3433_match_table); MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
static struct i2c_driver dlpc3433_driver = { static struct i2c_driver dlpc3433_driver = {
.probe_new = dlpc3433_probe, .probe = dlpc3433_probe,
.remove = dlpc3433_remove, .remove = dlpc3433_remove,
.id_table = dlpc3433_id, .id_table = dlpc3433_id,
.driver = { .driver = {
......
...@@ -748,7 +748,7 @@ static const struct of_device_id sn65dsi83_match_table[] = { ...@@ -748,7 +748,7 @@ static const struct of_device_id sn65dsi83_match_table[] = {
MODULE_DEVICE_TABLE(of, sn65dsi83_match_table); MODULE_DEVICE_TABLE(of, sn65dsi83_match_table);
static struct i2c_driver sn65dsi83_driver = { static struct i2c_driver sn65dsi83_driver = {
.probe_new = sn65dsi83_probe, .probe = sn65dsi83_probe,
.remove = sn65dsi83_remove, .remove = sn65dsi83_remove,
.id_table = sn65dsi83_id, .id_table = sn65dsi83_id,
.driver = { .driver = {
......
...@@ -1970,7 +1970,7 @@ static struct i2c_driver ti_sn65dsi86_driver = { ...@@ -1970,7 +1970,7 @@ static struct i2c_driver ti_sn65dsi86_driver = {
.of_match_table = ti_sn65dsi86_match_table, .of_match_table = ti_sn65dsi86_match_table,
.pm = &ti_sn65dsi86_pm_ops, .pm = &ti_sn65dsi86_pm_ops,
}, },
.probe_new = ti_sn65dsi86_probe, .probe = ti_sn65dsi86_probe,
.id_table = ti_sn65dsi86_id, .id_table = ti_sn65dsi86_id,
}; };
......
...@@ -408,7 +408,7 @@ static struct i2c_driver tfp410_i2c_driver = { ...@@ -408,7 +408,7 @@ static struct i2c_driver tfp410_i2c_driver = {
.of_match_table = of_match_ptr(tfp410_match), .of_match_table = of_match_ptr(tfp410_match),
}, },
.id_table = tfp410_i2c_ids, .id_table = tfp410_i2c_ids,
.probe_new = tfp410_i2c_probe, .probe = tfp410_i2c_probe,
.remove = tfp410_i2c_remove, .remove = tfp410_i2c_remove,
}; };
#endif /* IS_ENABLED(CONFIG_I2C) */ #endif /* IS_ENABLED(CONFIG_I2C) */
......
...@@ -492,7 +492,7 @@ static struct i2c_device_id tda9950_ids[] = { ...@@ -492,7 +492,7 @@ static struct i2c_device_id tda9950_ids[] = {
MODULE_DEVICE_TABLE(i2c, tda9950_ids); MODULE_DEVICE_TABLE(i2c, tda9950_ids);
static struct i2c_driver tda9950_driver = { static struct i2c_driver tda9950_driver = {
.probe_new = tda9950_probe, .probe = tda9950_probe,
.remove = tda9950_remove, .remove = tda9950_remove,
.driver = { .driver = {
.name = "tda9950", .name = "tda9950",
......
...@@ -2099,7 +2099,7 @@ static const struct i2c_device_id tda998x_ids[] = { ...@@ -2099,7 +2099,7 @@ static const struct i2c_device_id tda998x_ids[] = {
MODULE_DEVICE_TABLE(i2c, tda998x_ids); MODULE_DEVICE_TABLE(i2c, tda998x_ids);
static struct i2c_driver tda998x_driver = { static struct i2c_driver tda998x_driver = {
.probe_new = tda998x_probe, .probe = tda998x_probe,
.remove = tda998x_remove, .remove = tda998x_remove,
.driver = { .driver = {
.name = "tda998x", .name = "tda998x",
......
...@@ -308,7 +308,7 @@ static struct i2c_driver lcd_olinuxino_driver = { ...@@ -308,7 +308,7 @@ static struct i2c_driver lcd_olinuxino_driver = {
.name = "lcd_olinuxino", .name = "lcd_olinuxino",
.of_match_table = lcd_olinuxino_of_ids, .of_match_table = lcd_olinuxino_of_ids,
}, },
.probe_new = lcd_olinuxino_probe, .probe = lcd_olinuxino_probe,
.remove = lcd_olinuxino_remove, .remove = lcd_olinuxino_remove,
}; };
......
...@@ -489,7 +489,7 @@ static struct i2c_driver rpi_touchscreen_driver = { ...@@ -489,7 +489,7 @@ static struct i2c_driver rpi_touchscreen_driver = {
.name = "rpi_touchscreen", .name = "rpi_touchscreen",
.of_match_table = rpi_touchscreen_of_ids, .of_match_table = rpi_touchscreen_of_ids,
}, },
.probe_new = rpi_touchscreen_probe, .probe = rpi_touchscreen_probe,
.remove = rpi_touchscreen_remove, .remove = rpi_touchscreen_remove,
}; };
......
...@@ -100,7 +100,7 @@ static struct i2c_driver ssd130x_i2c_driver = { ...@@ -100,7 +100,7 @@ static struct i2c_driver ssd130x_i2c_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.of_match_table = ssd130x_of_match, .of_match_table = ssd130x_of_match,
}, },
.probe_new = ssd130x_i2c_probe, .probe = ssd130x_i2c_probe,
.remove = ssd130x_i2c_remove, .remove = ssd130x_i2c_remove,
.shutdown = ssd130x_i2c_shutdown, .shutdown = ssd130x_i2c_shutdown,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment