Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

misc: 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.

While touching these drivers, fix alignment in apds990x.c and bh1770glc.c.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Link: https://lore.kernel.org/r/20230517220135.170379-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Uwe Kleine-König and committed by
Greg Kroah-Hartman
f050bb8f 6e9b7cd6

+18 -18
+1 -1
drivers/misc/ad525x_dpot-i2c.c
··· 106 106 .driver = { 107 107 .name = "ad_dpot", 108 108 }, 109 - .probe_new = ad_dpot_i2c_probe, 109 + .probe = ad_dpot_i2c_probe, 110 110 .remove = ad_dpot_i2c_remove, 111 111 .id_table = ad_dpot_id, 112 112 };
+1 -1
drivers/misc/apds9802als.c
··· 296 296 .name = DRIVER_NAME, 297 297 .pm = APDS9802ALS_PM_OPS, 298 298 }, 299 - .probe_new = apds9802als_probe, 299 + .probe = apds9802als_probe, 300 300 .remove = apds9802als_remove, 301 301 .id_table = apds9802als_id, 302 302 };
+2 -2
drivers/misc/apds990x.c
··· 1267 1267 }; 1268 1268 1269 1269 static struct i2c_driver apds990x_driver = { 1270 - .driver = { 1270 + .driver = { 1271 1271 .name = "apds990x", 1272 1272 .pm = &apds990x_pm_ops, 1273 1273 }, 1274 - .probe_new = apds990x_probe, 1274 + .probe = apds990x_probe, 1275 1275 .remove = apds990x_remove, 1276 1276 .id_table = apds990x_id, 1277 1277 };
+2 -2
drivers/misc/bh1770glc.c
··· 1374 1374 }; 1375 1375 1376 1376 static struct i2c_driver bh1770_driver = { 1377 - .driver = { 1377 + .driver = { 1378 1378 .name = "bh1770glc", 1379 1379 .pm = &bh1770_pm_ops, 1380 1380 }, 1381 - .probe_new = bh1770_probe, 1381 + .probe = bh1770_probe, 1382 1382 .remove = bh1770_remove, 1383 1383 .id_table = bh1770_id, 1384 1384 };
+1 -1
drivers/misc/ds1682.c
··· 250 250 .name = "ds1682", 251 251 .of_match_table = ds1682_of_match, 252 252 }, 253 - .probe_new = ds1682_probe, 253 + .probe = ds1682_probe, 254 254 .remove = ds1682_remove, 255 255 .id_table = ds1682_id, 256 256 };
+1 -1
drivers/misc/eeprom/at24.c
··· 832 832 .of_match_table = at24_of_match, 833 833 .acpi_match_table = ACPI_PTR(at24_acpi_ids), 834 834 }, 835 - .probe_new = at24_probe, 835 + .probe = at24_probe, 836 836 .remove = at24_remove, 837 837 .id_table = at24_ids, 838 838 .flags = I2C_DRV_ACPI_WAIVE_D0_PROBE,
+1 -1
drivers/misc/eeprom/ee1004.c
··· 234 234 .name = "ee1004", 235 235 .dev_groups = ee1004_groups, 236 236 }, 237 - .probe_new = ee1004_probe, 237 + .probe = ee1004_probe, 238 238 .remove = ee1004_remove, 239 239 .id_table = ee1004_ids, 240 240 };
+1 -1
drivers/misc/eeprom/eeprom.c
··· 196 196 .driver = { 197 197 .name = "eeprom", 198 198 }, 199 - .probe_new = eeprom_probe, 199 + .probe = eeprom_probe, 200 200 .remove = eeprom_remove, 201 201 .id_table = eeprom_id, 202 202
+1 -1
drivers/misc/eeprom/idt_89hpesx.c
··· 1556 1556 .name = IDT_NAME, 1557 1557 .of_match_table = idt_of_match, 1558 1558 }, 1559 - .probe_new = idt_probe, 1559 + .probe = idt_probe, 1560 1560 .remove = idt_remove, 1561 1561 .id_table = idt_ids, 1562 1562 };
+1 -1
drivers/misc/eeprom/max6875.c
··· 192 192 .driver = { 193 193 .name = "max6875", 194 194 }, 195 - .probe_new = max6875_probe, 195 + .probe = max6875_probe, 196 196 .remove = max6875_remove, 197 197 .id_table = max6875_id, 198 198 };
+1 -1
drivers/misc/hmc6352.c
··· 131 131 .driver = { 132 132 .name = "hmc6352", 133 133 }, 134 - .probe_new = hmc6352_probe, 134 + .probe = hmc6352_probe, 135 135 .remove = hmc6352_remove, 136 136 .id_table = hmc6352_id, 137 137 };
+1 -1
drivers/misc/ics932s401.c
··· 105 105 .driver = { 106 106 .name = "ics932s401", 107 107 }, 108 - .probe_new = ics932s401_probe, 108 + .probe = ics932s401_probe, 109 109 .remove = ics932s401_remove, 110 110 .id_table = ics932s401_id, 111 111 .detect = ics932s401_detect,
+1 -1
drivers/misc/isl29003.c
··· 459 459 .name = ISL29003_DRV_NAME, 460 460 .pm = ISL29003_PM_OPS, 461 461 }, 462 - .probe_new = isl29003_probe, 462 + .probe = isl29003_probe, 463 463 .remove = isl29003_remove, 464 464 .id_table = isl29003_id, 465 465 };
+1 -1
drivers/misc/isl29020.c
··· 214 214 .name = "isl29020", 215 215 .pm = ISL29020_PM_OPS, 216 216 }, 217 - .probe_new = isl29020_probe, 217 + .probe = isl29020_probe, 218 218 .remove = isl29020_remove, 219 219 .id_table = isl29020_id, 220 220 };
+1 -1
drivers/misc/lis3lv02d/lis3lv02d_i2c.c
··· 262 262 .pm = &lis3_pm_ops, 263 263 .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids), 264 264 }, 265 - .probe_new = lis3lv02d_i2c_probe, 265 + .probe = lis3lv02d_i2c_probe, 266 266 .remove = lis3lv02d_i2c_remove, 267 267 .id_table = lis3lv02d_id, 268 268 };
+1 -1
drivers/misc/tsl2550.c
··· 437 437 .of_match_table = tsl2550_of_match, 438 438 .pm = TSL2550_PM_OPS, 439 439 }, 440 - .probe_new = tsl2550_probe, 440 + .probe = tsl2550_probe, 441 441 .remove = tsl2550_remove, 442 442 .id_table = tsl2550_id, 443 443 };