Commit Message
Uwe Kleine-König
Nov. 18, 2022, 10:39 p.m. UTC
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/touchscreen/iqs5xx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Comments
On Fri, Nov 18, 2022 at 11:39:41PM +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> Acked-by: Jeff LaBundy <jeff@labundy.com> > --- > drivers/input/touchscreen/iqs5xx.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c > index 34c4cca57d13..dc3137a34f35 100644 > --- a/drivers/input/touchscreen/iqs5xx.c > +++ b/drivers/input/touchscreen/iqs5xx.c > @@ -1019,8 +1019,7 @@ static int __maybe_unused iqs5xx_resume(struct device *dev) > > static SIMPLE_DEV_PM_OPS(iqs5xx_pm, iqs5xx_suspend, iqs5xx_resume); > > -static int iqs5xx_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int iqs5xx_probe(struct i2c_client *client) > { > struct iqs5xx_private *iqs5xx; > int error; > @@ -1094,7 +1093,7 @@ static struct i2c_driver iqs5xx_i2c_driver = { > .pm = &iqs5xx_pm, > }, > .id_table = iqs5xx_id, > - .probe = iqs5xx_probe, > + .probe_new = iqs5xx_probe, > }; > module_i2c_driver(iqs5xx_i2c_driver); > > -- > 2.38.1 >
diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c index 34c4cca57d13..dc3137a34f35 100644 --- a/drivers/input/touchscreen/iqs5xx.c +++ b/drivers/input/touchscreen/iqs5xx.c @@ -1019,8 +1019,7 @@ static int __maybe_unused iqs5xx_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(iqs5xx_pm, iqs5xx_suspend, iqs5xx_resume); -static int iqs5xx_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int iqs5xx_probe(struct i2c_client *client) { struct iqs5xx_private *iqs5xx; int error; @@ -1094,7 +1093,7 @@ static struct i2c_driver iqs5xx_i2c_driver = { .pm = &iqs5xx_pm, }, .id_table = iqs5xx_id, - .probe = iqs5xx_probe, + .probe_new = iqs5xx_probe, }; module_i2c_driver(iqs5xx_i2c_driver);