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

index e9bd36adbe47dab23913aa2cc5cc9f5f315ec6de..4897fafa4204d04caba5ad307dc132f375e8af1f 100644 (file)
@@ -913,9 +913,9 @@ static void ili210x_stop(void *data)
        priv->stop = true;
 }
 
-static int ili210x_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int ili210x_i2c_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct device *dev = &client->dev;
        const struct ili2xxx_chip *chip;
        struct ili210x *priv;
@@ -1043,7 +1043,7 @@ static struct i2c_driver ili210x_ts_driver = {
                .of_match_table = ili210x_dt_ids,
        },
        .id_table = ili210x_i2c_id,
-       .probe = ili210x_i2c_probe,
+       .probe_new = ili210x_i2c_probe,
 };
 
 module_i2c_driver(ili210x_ts_driver);