From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx> --- drivers/input/touchscreen/cy8ctmg110_ts.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c index 495ef156cf43..7c2b7309dbaf 100644 --- a/drivers/input/touchscreen/cy8ctmg110_ts.c +++ b/drivers/input/touchscreen/cy8ctmg110_ts.c @@ -168,8 +168,7 @@ static void cy8ctmg110_shut_off(void *_ts) cy8ctmg110_power(ts, false); } -static int cy8ctmg110_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cy8ctmg110_probe(struct i2c_client *client) { struct cy8ctmg110 *ts; struct input_dev *input_dev; @@ -279,7 +278,7 @@ static struct i2c_driver cy8ctmg110_driver = { .pm = &cy8ctmg110_pm, }, .id_table = cy8ctmg110_idtable, - .probe = cy8ctmg110_probe, + .probe_new = cy8ctmg110_probe, }; module_i2c_driver(cy8ctmg110_driver); -- 2.38.1