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

nfc: 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: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Uwe Kleine-König and committed by
David S. Miller
efc3001f fe79bd65

+9 -9
+1 -1
drivers/nfc/fdp/i2c.c
··· 359 359 .name = FDP_I2C_DRIVER_NAME, 360 360 .acpi_match_table = fdp_nci_i2c_acpi_match, 361 361 }, 362 - .probe_new = fdp_nci_i2c_probe, 362 + .probe = fdp_nci_i2c_probe, 363 363 .remove = fdp_nci_i2c_remove, 364 364 }; 365 365 module_i2c_driver(fdp_nci_i2c_driver);
+1 -1
drivers/nfc/microread/i2c.c
··· 286 286 .driver = { 287 287 .name = MICROREAD_I2C_DRIVER_NAME, 288 288 }, 289 - .probe_new = microread_i2c_probe, 289 + .probe = microread_i2c_probe, 290 290 .remove = microread_i2c_remove, 291 291 .id_table = microread_i2c_id, 292 292 };
+1 -1
drivers/nfc/nfcmrvl/i2c.c
··· 258 258 MODULE_DEVICE_TABLE(i2c, nfcmrvl_i2c_id_table); 259 259 260 260 static struct i2c_driver nfcmrvl_i2c_driver = { 261 - .probe_new = nfcmrvl_i2c_probe, 261 + .probe = nfcmrvl_i2c_probe, 262 262 .id_table = nfcmrvl_i2c_id_table, 263 263 .remove = nfcmrvl_i2c_remove, 264 264 .driver = {
+1 -1
drivers/nfc/nxp-nci/i2c.c
··· 348 348 .acpi_match_table = ACPI_PTR(acpi_id), 349 349 .of_match_table = of_nxp_nci_i2c_match, 350 350 }, 351 - .probe_new = nxp_nci_i2c_probe, 351 + .probe = nxp_nci_i2c_probe, 352 352 .id_table = nxp_nci_i2c_id_table, 353 353 .remove = nxp_nci_i2c_remove, 354 354 };
+1 -1
drivers/nfc/pn533/i2c.c
··· 259 259 .name = PN533_I2C_DRIVER_NAME, 260 260 .of_match_table = of_match_ptr(of_pn533_i2c_match), 261 261 }, 262 - .probe_new = pn533_i2c_probe, 262 + .probe = pn533_i2c_probe, 263 263 .id_table = pn533_i2c_id_table, 264 264 .remove = pn533_i2c_remove, 265 265 };
+1 -1
drivers/nfc/pn544/i2c.c
··· 953 953 .of_match_table = of_match_ptr(of_pn544_i2c_match), 954 954 .acpi_match_table = ACPI_PTR(pn544_hci_i2c_acpi_match), 955 955 }, 956 - .probe_new = pn544_hci_i2c_probe, 956 + .probe = pn544_hci_i2c_probe, 957 957 .id_table = pn544_hci_i2c_id_table, 958 958 .remove = pn544_hci_i2c_remove, 959 959 };
+1 -1
drivers/nfc/s3fwrn5/i2c.c
··· 261 261 .name = S3FWRN5_I2C_DRIVER_NAME, 262 262 .of_match_table = of_match_ptr(of_s3fwrn5_i2c_match), 263 263 }, 264 - .probe_new = s3fwrn5_i2c_probe, 264 + .probe = s3fwrn5_i2c_probe, 265 265 .remove = s3fwrn5_i2c_remove, 266 266 .id_table = s3fwrn5_i2c_id_table, 267 267 };
+1 -1
drivers/nfc/st-nci/i2c.c
··· 283 283 .of_match_table = of_match_ptr(of_st_nci_i2c_match), 284 284 .acpi_match_table = ACPI_PTR(st_nci_i2c_acpi_match), 285 285 }, 286 - .probe_new = st_nci_i2c_probe, 286 + .probe = st_nci_i2c_probe, 287 287 .id_table = st_nci_i2c_id_table, 288 288 .remove = st_nci_i2c_remove, 289 289 };
+1 -1
drivers/nfc/st21nfca/i2c.c
··· 597 597 .of_match_table = of_match_ptr(of_st21nfca_i2c_match), 598 598 .acpi_match_table = ACPI_PTR(st21nfca_hci_i2c_acpi_match), 599 599 }, 600 - .probe_new = st21nfca_hci_i2c_probe, 600 + .probe = st21nfca_hci_i2c_probe, 601 601 .id_table = st21nfca_hci_i2c_id_table, 602 602 .remove = st21nfca_hci_i2c_remove, 603 603 };