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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20221118224540.619276-200-uwe@kleine-koenig.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
index ac1637a3389e31c269529a3d928e820cd5c138f9..34683458524caf13f5c21cfdf2bd489695a4efb0 100644 (file)
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c
@@ -92,9 +92,9 @@ static irqreturn_t mcs_touchkey_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static int mcs_touchkey_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int mcs_touchkey_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        const struct mcs_platform_data *pdata;
        struct mcs_touchkey_data *data;
        struct input_dev *input_dev;
@@ -260,7 +260,7 @@ static struct i2c_driver mcs_touchkey_driver = {
                .name   = "mcs_touchkey",
                .pm     = &mcs_touchkey_pm_ops,
        },
-       .probe          = mcs_touchkey_probe,
+       .probe_new      = mcs_touchkey_probe,
        .remove         = mcs_touchkey_remove,
        .shutdown       = mcs_touchkey_shutdown,
        .id_table       = mcs_touchkey_id,