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

index dc148b4bed74cd1e203c4da2ed6cdf8b8d309c1a..7959947a34584fafb1a2af7f8d3c1320d792cb9c 100644 (file)
@@ -462,9 +462,9 @@ unlock:
 static SIMPLE_DEV_PM_OPS(pixcir_dev_pm_ops,
                         pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume);
 
-static int pixcir_i2c_ts_probe(struct i2c_client *client,
-                              const struct i2c_device_id *id)
+static int pixcir_i2c_ts_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct device *dev = &client->dev;
        struct pixcir_i2c_ts_data *tsdata;
        struct input_dev *input;
@@ -617,7 +617,7 @@ static struct i2c_driver pixcir_i2c_ts_driver = {
                .pm     = &pixcir_dev_pm_ops,
                .of_match_table = of_match_ptr(pixcir_of_match),
        },
-       .probe          = pixcir_i2c_ts_probe,
+       .probe_new      = pixcir_i2c_ts_probe,
        .id_table       = pixcir_i2c_ts_id,
 };