summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:38:47 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2022-12-02 14:53:41 -0800
commit5a5fa6583e856e134d3a27db5b4c90020c3bfc9a (patch)
treed35be8f451da821b9a17962e8db55115aa34f885 /drivers/input/keyboard
parentf043ad51e5c651cc8e45ebd2c13fa61aef0b3a5f (diff)
downloadlinux-5a5fa6583e856e134d3a27db5b4c90020c3bfc9a.tar.bz2
Input: adp5589-keys - 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-194-uwe@kleine-koenig.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/adp5589-keys.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index bdd264459a97..25c9f6344bf2 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -942,9 +942,9 @@ static void adp5589_clear_config(void *data)
adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
}
-static int adp5589_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int adp5589_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct adp5589_kpad *kpad;
const struct adp5589_kpad_platform_data *pdata =
dev_get_platdata(&client->dev);
@@ -1054,7 +1054,7 @@ static struct i2c_driver adp5589_driver = {
.name = KBUILD_MODNAME,
.pm = &adp5589_dev_pm_ops,
},
- .probe = adp5589_probe,
+ .probe_new = adp5589_probe,
.id_table = adp5589_id,
};