]> git.dujemihanovic.xyz Git - linux.git/commitdiff
Input: sx8654 - Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:39:55 +0000 (23:39 +0100)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 2 Dec 2022 22:53:47 +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-262-uwe@kleine-koenig.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/sx8654.c

index de85e57b248605957bb7290d770fa7d1ee708f0a..52ae730358303a60e323f9d01db7f878259d07f9 100644 (file)
@@ -306,9 +306,9 @@ static void sx8654_close(struct input_dev *dev)
        }
 }
 
-static int sx8654_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int sx8654_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct sx8654 *sx8654;
        struct input_dev *input;
        int error;
@@ -470,7 +470,7 @@ static struct i2c_driver sx8654_driver = {
                .of_match_table = of_match_ptr(sx8654_of_match),
        },
        .id_table = sx8654_id_table,
-       .probe = sx8654_probe,
+       .probe_new = sx8654_probe,
 };
 module_i2c_driver(sx8654_driver);