Input: tca6416-keypad - Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:38:57 +0000 (23:38 +0100)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 2 Dec 2022 22:53:42 +0000 (14:53 -0800)
.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-204-uwe@kleine-koenig.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/tca6416-keypad.c

index afcdfbb..281d9ec 100644 (file)
@@ -194,9 +194,9 @@ static int tca6416_setup_registers(struct tca6416_keypad_chip *chip)
        return 0;
 }
 
-static int tca6416_keypad_probe(struct i2c_client *client,
-                                  const struct i2c_device_id *id)
+static int tca6416_keypad_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct tca6416_keys_platform_data *pdata;
        struct tca6416_keypad_chip *chip;
        struct input_dev *input;
@@ -352,7 +352,7 @@ static struct i2c_driver tca6416_keypad_driver = {
                .name   = "tca6416-keypad",
                .pm     = &tca6416_keypad_dev_pm_ops,
        },
-       .probe          = tca6416_keypad_probe,
+       .probe_new      = tca6416_keypad_probe,
        .remove         = tca6416_keypad_remove,
        .id_table       = tca6416_id,
 };