Skip to content

Commit

Permalink
Input: elants_i2c - switch to probe_new
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai authored and Dmitry Torokhov committed May 31, 2021
1 parent b9c0ebb commit 45a4b68
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/input/touchscreen/elants_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 45a4b68

Please sign in to comment.