summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/st1232.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-19 01:39:53 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2022-12-03 01:53:47 +0300
commit8ff48be322fbce75fd0ca9fcb6c950e87db22171 (patch)
treeb4e91aa7c8992d6e23ae6d539420155d76c5d13f /drivers/input/touchscreen/st1232.c
parent6440fab21644bec742b58cc2133b4b0a0d8e5710 (diff)
downloadlinux-8ff48be322fbce75fd0ca9fcb6c950e87db22171.tar.xz
Input: st1232 - 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-260-uwe@kleine-koenig.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen/st1232.c')
-rw-r--r--drivers/input/touchscreen/st1232.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index e38ba3e4f183..bd68633dc6c0 100644
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -220,9 +220,9 @@ static const struct st_chip_info st1633_chip_info = {
.max_fingers = 5,
};
-static int st1232_ts_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int st1232_ts_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
const struct st_chip_info *match;
struct st1232_ts_data *ts;
struct input_dev *input_dev;
@@ -384,7 +384,7 @@ static const struct of_device_id st1232_ts_dt_ids[] = {
MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
static struct i2c_driver st1232_ts_driver = {
- .probe = st1232_ts_probe,
+ .probe_new = st1232_ts_probe,
.id_table = st1232_ts_id,
.driver = {
.name = ST1232_TS_NAME,