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>

diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c
index 1e0f229..c1896a1 100644 (file)
--- a/drivers/nfc/fdp/i2c.c
+++ b/drivers/nfc/fdp/i2c.c
@@ -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);

diff --git a/drivers/nfc/microread/i2c.c b/drivers/nfc/microread/i2c.c
index e72b358..642df4e 100644 (file)
--- a/drivers/nfc/microread/i2c.c
+++ b/drivers/nfc/microread/i2c.c
@@ -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,
 };

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 164e2ab..7455313 100644 (file)
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -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 = {

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index d4c299b..baddaf2 100644 (file)
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -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,
 };

diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c
index 1503a98..438ab95 100644 (file)
--- a/drivers/nfc/pn533/i2c.c
+++ b/drivers/nfc/pn533/i2c.c
@@ -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,
 };

diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index 8b0d910..3f6d748 100644 (file)
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -953,7 +953,7 @@ static struct i2c_driver pn544_hci_i2c_driver = {
                   .of_match_table = of_match_ptr(of_pn544_i2c_match),
                   .acpi_match_table = ACPI_PTR(pn544_hci_i2c_acpi_match),
                  },
-       .probe_new = pn544_hci_i2c_probe,
+       .probe = pn544_hci_i2c_probe,
        .id_table = pn544_hci_i2c_id_table,
        .remove = pn544_hci_i2c_remove,
 };

diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c
index 2517ae7..720d4a7 100644 (file)
--- a/drivers/nfc/s3fwrn5/i2c.c
+++ b/drivers/nfc/s3fwrn5/i2c.c
@@ -261,7 +261,7 @@ static struct i2c_driver s3fwrn5_i2c_driver = {
                .name = S3FWRN5_I2C_DRIVER_NAME,
                .of_match_table = of_match_ptr(of_s3fwrn5_i2c_match),
        },
-       .probe_new = s3fwrn5_i2c_probe,
+       .probe = s3fwrn5_i2c_probe,
        .remove = s3fwrn5_i2c_remove,
        .id_table = s3fwrn5_i2c_id_table,
 };

diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index 6b5eed8..d20a337 100644 (file)
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -283,7 +283,7 @@ static struct i2c_driver st_nci_i2c_driver = {
                .of_match_table = of_match_ptr(of_st_nci_i2c_match),
                .acpi_match_table = ACPI_PTR(st_nci_i2c_acpi_match),
        },
-       .probe_new = st_nci_i2c_probe,
+       .probe = st_nci_i2c_probe,
        .id_table = st_nci_i2c_id_table,
        .remove = st_nci_i2c_remove,
 };

diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index 55f7a23..064a63d 100644 (file)
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -597,7 +597,7 @@ static struct i2c_driver st21nfca_hci_i2c_driver = {
                .of_match_table = of_match_ptr(of_st21nfca_i2c_match),
                .acpi_match_table = ACPI_PTR(st21nfca_hci_i2c_acpi_match),
        },
-       .probe_new = st21nfca_hci_i2c_probe,
+       .probe = st21nfca_hci_i2c_probe,
        .id_table = st21nfca_hci_i2c_id_table,
        .remove = st21nfca_hci_i2c_remove,
 };