From: Uwe Kleine-König Date: Fri, 18 Nov 2022 22:39:55 +0000 (+0100) Subject: Input: sx8654 - Convert to i2c's .probe_new() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bc0bbf91c4bbdb0173827463ef41c3d26165e1db;p=linux.git Input: sx8654 - 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 Link: https://lore.kernel.org/r/20221118224540.619276-262-uwe@kleine-koenig.org Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c index de85e57b24860..52ae730358303 100644 --- a/drivers/input/touchscreen/sx8654.c +++ b/drivers/input/touchscreen/sx8654.c @@ -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);