OSDN Git Service

nfc: st21nfca: i2c: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 23 Nov 2022 04:55:07 +0000 (20:55 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 23 Nov 2022 20:50:08 +0000 (12:50 -0800)
The probe function doesn't make use of the i2c_device_id * parameter so it
can be trivially converted.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/nfc/st21nfca/i2c.c

index 76b5598..55f7a23 100644 (file)
@@ -487,8 +487,7 @@ static const struct acpi_gpio_mapping acpi_st21nfca_gpios[] = {
        {},
 };
 
-static int st21nfca_hci_i2c_probe(struct i2c_client *client,
-                                 const struct i2c_device_id *id)
+static int st21nfca_hci_i2c_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct st21nfca_i2c_phy *phy;
@@ -598,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 = st21nfca_hci_i2c_probe,
+       .probe_new = st21nfca_hci_i2c_probe,
        .id_table = st21nfca_hci_i2c_id_table,
        .remove = st21nfca_hci_i2c_remove,
 };