[PATCH 203/606] Input: tca6416-keypad - Convert to i2c's .probe_new()
From: Uwe Kleine-König <hidden>
Date: 2022-11-19 00:00:25
Also in:
linux-i2c, lkml
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
From: Uwe Kleine-König <redacted> .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 <redacted> --- drivers/input/keyboard/tca6416-keypad.c | 6 +++--- 1 file 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, };
--
2.38.1