Message ID | 20221118224540.619276-232-uwe@kleine-koenig.org (mailing list archive) |
---|---|
State | Mainlined |
Commit | 4e499793a7f7b0939fb8c79273925549e6ab4f14 |
Headers | show |
Series | i2c: Complete conversion to i2c_probe_new | expand |
Hi, On 11/18/22 23:39, 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> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/input/touchscreen/chipone_icn8318.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/touchscreen/chipone_icn8318.c b/drivers/input/touchscreen/chipone_icn8318.c > index f2fb41fb031e..f6769e4bd4f2 100644 > --- a/drivers/input/touchscreen/chipone_icn8318.c > +++ b/drivers/input/touchscreen/chipone_icn8318.c > @@ -176,8 +176,7 @@ static int icn8318_resume(struct device *dev) > > static SIMPLE_DEV_PM_OPS(icn8318_pm_ops, icn8318_suspend, icn8318_resume); > > -static int icn8318_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int icn8318_probe(struct i2c_client *client) > { > struct device *dev = &client->dev; > struct icn8318_data *data; > @@ -267,7 +266,7 @@ static struct i2c_driver icn8318_driver = { > .pm = &icn8318_pm_ops, > .of_match_table = icn8318_of_match, > }, > - .probe = icn8318_probe, > + .probe_new = icn8318_probe, > .id_table = icn8318_i2c_id, > }; >
diff --git a/drivers/input/touchscreen/chipone_icn8318.c b/drivers/input/touchscreen/chipone_icn8318.c index f2fb41fb031e..f6769e4bd4f2 100644 --- a/drivers/input/touchscreen/chipone_icn8318.c +++ b/drivers/input/touchscreen/chipone_icn8318.c @@ -176,8 +176,7 @@ static int icn8318_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(icn8318_pm_ops, icn8318_suspend, icn8318_resume); -static int icn8318_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int icn8318_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct icn8318_data *data; @@ -267,7 +266,7 @@ static struct i2c_driver icn8318_driver = { .pm = &icn8318_pm_ops, .of_match_table = icn8318_of_match, }, - .probe = icn8318_probe, + .probe_new = icn8318_probe, .id_table = icn8318_i2c_id, };