summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/tca6416-keypad.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:38:57 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2022-12-02 14:53:42 -0800
commit3da11976b80c663181172065caea1a6b38e7dce8 (patch)
tree628b238b3d33206216b8e4ffe0eb455877b3355b /drivers/input/keyboard/tca6416-keypad.c
parentb37a4c1bd2aeff728960c36a283977f2a88be3a8 (diff)
downloadlinux-3da11976b80c663181172065caea1a6b38e7dce8.tar.bz2
Input: tca6416-keypad - 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-204-uwe@kleine-koenig.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard/tca6416-keypad.c')
-rw-r--r--drivers/input/keyboard/tca6416-keypad.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c
index afcdfbb002ff..281d9ec163cc 100644
--- a/drivers/input/keyboard/tca6416-keypad.c
+++ b/drivers/input/keyboard/tca6416-keypad.c
@@ -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,
};