Message ID | 20221118224540.619276-223-uwe@kleine-koenig.org (mailing list archive) |
---|---|
State | Mainlined |
Commit | 05b2456d9dbe2c798010be7f636c734248ecd99a |
Headers | show |
Series | i2c: Complete conversion to i2c_probe_new | expand |
On Fri, 18 Nov 2022 23:39:16 +0100, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/input/mouse/synaptics_i2c.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c > index 987ee67a1045..6487c8c60d5e 100644 > --- a/drivers/input/mouse/synaptics_i2c.c > +++ b/drivers/input/mouse/synaptics_i2c.c > @@ -521,8 +521,7 @@ static struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *clien > return touch; > } > > -static int synaptics_i2c_probe(struct i2c_client *client, > - const struct i2c_device_id *dev_id) > +static int synaptics_i2c_probe(struct i2c_client *client) > { > int ret; > struct synaptics_i2c *touch; > @@ -651,7 +650,7 @@ static struct i2c_driver synaptics_i2c_driver = { > .pm = &synaptics_i2c_pm, > }, > > - .probe = synaptics_i2c_probe, > + .probe_new = synaptics_i2c_probe, > .remove = synaptics_i2c_remove, > > .id_table = synaptics_i2c_id_table, Reviewed-by: Jean Delvare <jdelvare@suse.de>
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index 987ee67a1045..6487c8c60d5e 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c @@ -521,8 +521,7 @@ static struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *clien return touch; } -static int synaptics_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *dev_id) +static int synaptics_i2c_probe(struct i2c_client *client) { int ret; struct synaptics_i2c *touch; @@ -651,7 +650,7 @@ static struct i2c_driver synaptics_i2c_driver = { .pm = &synaptics_i2c_pm, }, - .probe = synaptics_i2c_probe, + .probe_new = synaptics_i2c_probe, .remove = synaptics_i2c_remove, .id_table = synaptics_i2c_id_table,