Commit 742c4687 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Dmitry Torokhov

Input: mcs_touchkey - Convert to i2c's .probe_new()

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20221118224540.619276-200-uwe@kleine-koenig.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent f424fe08
...@@ -92,9 +92,9 @@ static irqreturn_t mcs_touchkey_interrupt(int irq, void *dev_id) ...@@ -92,9 +92,9 @@ static irqreturn_t mcs_touchkey_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int mcs_touchkey_probe(struct i2c_client *client, static int mcs_touchkey_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(client);
const struct mcs_platform_data *pdata; const struct mcs_platform_data *pdata;
struct mcs_touchkey_data *data; struct mcs_touchkey_data *data;
struct input_dev *input_dev; struct input_dev *input_dev;
...@@ -260,7 +260,7 @@ static struct i2c_driver mcs_touchkey_driver = { ...@@ -260,7 +260,7 @@ static struct i2c_driver mcs_touchkey_driver = {
.name = "mcs_touchkey", .name = "mcs_touchkey",
.pm = &mcs_touchkey_pm_ops, .pm = &mcs_touchkey_pm_ops,
}, },
.probe = mcs_touchkey_probe, .probe_new = mcs_touchkey_probe,
.remove = mcs_touchkey_remove, .remove = mcs_touchkey_remove,
.shutdown = mcs_touchkey_shutdown, .shutdown = mcs_touchkey_shutdown,
.id_table = mcs_touchkey_id, .id_table = mcs_touchkey_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment