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/keyboard/tm2-touchkey.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/input/keyboard/tm2-touchkey.c b/drivers/input/keyboard/tm2-touchkey.c index 632cd6c1c8d4..086aafaf0418 100644 --- a/drivers/input/keyboard/tm2-touchkey.c +++ b/drivers/input/keyboard/tm2-touchkey.c @@ -181,8 +181,7 @@ static irqreturn_t tm2_touchkey_irq_handler(int irq, void *devid) return IRQ_HANDLED; } -static int tm2_touchkey_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int tm2_touchkey_probe(struct i2c_client *client) { struct device_node *np = client->dev.of_node; struct tm2_touchkey_data *touchkey; @@ -357,7 +356,7 @@ static struct i2c_driver tm2_touchkey_driver = { .pm = &tm2_touchkey_pm_ops, .of_match_table = of_match_ptr(tm2_touchkey_of_match), }, - .probe = tm2_touchkey_probe, + .probe_new = tm2_touchkey_probe, .id_table = tm2_touchkey_id_table, }; module_i2c_driver(tm2_touchkey_driver); -- 2.38.1