HID: i2c-hid: 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>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c
index 3a7e2bcb5412044339107c15042521c0a3c89408..ac918a9ea8d34440df8ad9c6a009d60a4ffdbbf0 100644 (file)
--- a/drivers/hid/i2c-hid/i2c-hid-acpi.c
+++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c
@@ -118,7 +118,7 @@ static struct i2c_driver i2c_hid_acpi_driver = {
                .acpi_match_table = i2c_hid_acpi_match,
        },
 
-       .probe_new      = i2c_hid_acpi_probe,
+       .probe          = i2c_hid_acpi_probe,
        .remove         = i2c_hid_core_remove,
        .shutdown       = i2c_hid_core_shutdown,
 };

diff --git a/drivers/hid/i2c-hid/i2c-hid-of-elan.c b/drivers/hid/i2c-hid/i2c-hid-of-elan.c
index 76ddc8be1cbbc6c853fec5c292bf9af57e8c32a9..029045d9661c6e23b1f5a9ba0caaf67a5c9a5372 100644 (file)
--- a/drivers/hid/i2c-hid/i2c-hid-of-elan.c
+++ b/drivers/hid/i2c-hid/i2c-hid-of-elan.c
@@ -118,7 +118,7 @@ static struct i2c_driver elan_i2c_hid_ts_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(elan_i2c_hid_of_match),
        },
-       .probe_new      = i2c_hid_of_elan_probe,
+       .probe          = i2c_hid_of_elan_probe,
        .remove         = i2c_hid_core_remove,
        .shutdown       = i2c_hid_core_shutdown,
 };

diff --git a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
index 0060e3dcd775d8fe081c7df4ecf34d3ff557bf20..06edb90ab7c07226fe79181ba4f433110d3d59c9 100644 (file)
--- a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
+++ b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
@@ -114,7 +114,7 @@ static struct i2c_driver goodix_i2c_hid_ts_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(goodix_i2c_hid_of_match),
        },
-       .probe_new      = i2c_hid_of_goodix_probe,
+       .probe          = i2c_hid_of_goodix_probe,
        .remove         = i2c_hid_core_remove,
        .shutdown       = i2c_hid_core_shutdown,
 };

diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c
index 855f53092f4e37b34fd94c04224cdafb8febdb4a..c4e1fa0273c84c3b2e3b438e04673727b05e6f6e 100644 (file)
--- a/drivers/hid/i2c-hid/i2c-hid-of.c
+++ b/drivers/hid/i2c-hid/i2c-hid-of.c
@@ -157,7 +157,7 @@ static struct i2c_driver i2c_hid_of_driver = {
                .of_match_table = of_match_ptr(i2c_hid_of_match),
        },
 
-       .probe_new      = i2c_hid_of_probe,
+       .probe          = i2c_hid_of_probe,
        .remove         = i2c_hid_core_remove,
        .shutdown       = i2c_hid_core_shutdown,
        .id_table       = i2c_hid_of_id_table,