Merge branch 'next' into for-linus

[linux-block.git] / drivers / input / touchscreen / goodix.c

diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index c281e49826c2367227dce0a8f9e3688377b00e7e..8a0a8078de8f7c75fe7681639fc629253d698499 100644 (file)
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -1282,8 +1282,7 @@ static void goodix_disable_regulators(void *arg)
        regulator_disable(ts->avdd28);
 }
 
-static int goodix_ts_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int goodix_ts_probe(struct i2c_client *client)
 {
        struct goodix_ts_data *ts;
        const char *cfg_name;
@@ -1537,7 +1536,7 @@ MODULE_DEVICE_TABLE(of, goodix_of_match);
 #endif
 
 static struct i2c_driver goodix_ts_driver = {
-       .probe = goodix_ts_probe,
+       .probe_new = goodix_ts_probe,
        .remove = goodix_ts_remove,
        .id_table = goodix_ts_id,
        .driver = {