Merge branch 'for-6.2/i2c' into for-linus

[mirror_ubuntu-kernels.git] / drivers / hid / i2c-hid / i2c-hid-of-goodix.c

diff --git a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
index ec6c73f75ffe02217fb0ba9a1b2673ac86d72063..29c6cb174032ae564c7d57a6e8c321e81ebc1c15 100644 (file)
--- a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
+++ b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
@@ -87,8 +87,7 @@ static int ihid_goodix_vdd_notify(struct notifier_block *nb,
        return ret;
 }
 
-static int i2c_hid_of_goodix_probe(struct i2c_client *client,
-                                  const struct i2c_device_id *id)
+static int i2c_hid_of_goodix_probe(struct i2c_client *client)
 {
        struct i2c_hid_of_goodix *ihid_goodix;
        int ret;
@@ -167,7 +166,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          = i2c_hid_of_goodix_probe,
+       .probe_new      = i2c_hid_of_goodix_probe,
        .remove         = i2c_hid_core_remove,
        .shutdown       = i2c_hid_core_shutdown,
 };