Commit efc3001f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller
Browse files

nfc: 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 avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe79bd65

drivers/nfc/fdp/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static struct i2c_driver fdp_nci_i2c_driver = { 
		   .name = FDP_I2C_DRIVER_NAME,

		   .acpi_match_table = fdp_nci_i2c_acpi_match,

		  },

	.probe_new = fdp_nci_i2c_probe,

	.probe = fdp_nci_i2c_probe,

	.remove = fdp_nci_i2c_remove,

};

module_i2c_driver(fdp_nci_i2c_driver);

drivers/nfc/microread/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static struct i2c_driver microread_i2c_driver = { 
	.driver = {

		.name = MICROREAD_I2C_DRIVER_NAME,

	},

	.probe_new	= microread_i2c_probe,

	.probe		= microread_i2c_probe,

	.remove		= microread_i2c_remove,

	.id_table	= microread_i2c_id,

};

drivers/nfc/nfcmrvl/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static const struct i2c_device_id nfcmrvl_i2c_id_table[] = { 
MODULE_DEVICE_TABLE(i2c, nfcmrvl_i2c_id_table);



static struct i2c_driver nfcmrvl_i2c_driver = {

	.probe_new = nfcmrvl_i2c_probe,

	.probe = nfcmrvl_i2c_probe,

	.id_table = nfcmrvl_i2c_id_table,

	.remove = nfcmrvl_i2c_remove,

	.driver = {

drivers/nfc/nxp-nci/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static struct i2c_driver nxp_nci_i2c_driver = { 
		   .acpi_match_table = ACPI_PTR(acpi_id),

		   .of_match_table = of_nxp_nci_i2c_match,

		  },

	.probe_new = nxp_nci_i2c_probe,

	.probe = nxp_nci_i2c_probe,

	.id_table = nxp_nci_i2c_id_table,

	.remove = nxp_nci_i2c_remove,

};

drivers/nfc/pn533/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static struct i2c_driver pn533_i2c_driver = { 
		   .name = PN533_I2C_DRIVER_NAME,

		   .of_match_table = of_match_ptr(of_pn533_i2c_match),

		  },

	.probe_new = pn533_i2c_probe,

	.probe = pn533_i2c_probe,

	.id_table = pn533_i2c_id_table,

	.remove = pn533_i2c_remove,

};