]> git.dujemihanovic.xyz Git - linux.git/commitdiff
Input: silead - Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:39:51 +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>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20221118224540.619276-258-uwe@kleine-koenig.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/silead.c

index 3eef8c01090fd528e69f38328c78f5b0b095fb00..8a7351c4414cc1c5b994e1429e1df4aa521b9542 100644 (file)
@@ -652,9 +652,9 @@ static void silead_disable_regulator(void *arg)
        regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);
 }
 
-static int silead_ts_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int silead_ts_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct silead_ts_data *data;
        struct device *dev = &client->dev;
        int error;
@@ -826,7 +826,7 @@ MODULE_DEVICE_TABLE(of, silead_ts_of_match);
 #endif
 
 static struct i2c_driver silead_ts_driver = {
-       .probe = silead_ts_probe,
+       .probe_new = silead_ts_probe,
        .id_table = silead_ts_id,
        .driver = {
                .name = SILEAD_TS_NAME,