summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-05-31 07:44:04 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-05-31 07:53:50 +0300
commit45a4b68354ffccbc9ca71027bd34754ca24f5183 (patch)
tree15f943954af89c990fc52e0a9e09bde1dcd10cd7 /drivers/input
parentb9c0ebb867d67cc4e9e1a7a2abf0ac9a2cc02051 (diff)
downloadlinux-45a4b68354ffccbc9ca71027bd34754ca24f5183.tar.xz
Input: elants_i2c - switch to probe_new
Now that we get rid of the usage of id argument at probe again, let's switch to the new i2c probe method; this will avoid for people misusing the possibly unassigned id pointer again. Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://lore.kernel.org/r/20210528071024.26450-2-tiwai@suse.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/elants_i2c.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 0f9e3ec99aae..68f542bb809f 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1369,8 +1369,7 @@ static bool elants_acpi_is_hid_device(struct device *dev)
}
#endif
-static int elants_i2c_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int elants_i2c_probe(struct i2c_client *client)
{
union i2c_smbus_data dummy;
struct elants_data *ts;
@@ -1644,7 +1643,7 @@ MODULE_DEVICE_TABLE(of, elants_of_match);
#endif
static struct i2c_driver elants_i2c_driver = {
- .probe = elants_i2c_probe,
+ .probe_new = elants_i2c_probe,
.id_table = elants_i2c_id,
.driver = {
.name = DEVICE_NAME,