| Message ID | 20221118224540.619276-210-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 22972ef8093378f9eb9729ea7a17c5ab6df00950 |
| Headers | show |
| Series | i2c: Complete conversion to i2c_probe_new | expand |
On Fri, 18 Nov 2022 23:39:03 +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/misc/atmel_captouch.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/misc/atmel_captouch.c b/drivers/input/misc/atmel_captouch.c > index 156c699a8913..d9704b174d3a 100644 > --- a/drivers/input/misc/atmel_captouch.c > +++ b/drivers/input/misc/atmel_captouch.c > @@ -161,8 +161,7 @@ static irqreturn_t atmel_captouch_isr(int irq, void *data) > /* > * Probe function to setup the device, input system and interrupt > */ > -static int atmel_captouch_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int atmel_captouch_probe(struct i2c_client *client) > { > struct atmel_captouch_device *capdev; > struct device *dev = &client->dev; > @@ -264,7 +263,7 @@ static const struct i2c_device_id atmel_captouch_id[] = { > MODULE_DEVICE_TABLE(i2c, atmel_captouch_id); > > static struct i2c_driver atmel_captouch_driver = { > - .probe = atmel_captouch_probe, > + .probe_new = atmel_captouch_probe, > .id_table = atmel_captouch_id, > .driver = { > .name = "atmel_captouch", Reviewed-by: Jean Delvare <jdelvare@suse.de>
diff --git a/drivers/input/misc/atmel_captouch.c b/drivers/input/misc/atmel_captouch.c index 156c699a8913..d9704b174d3a 100644 --- a/drivers/input/misc/atmel_captouch.c +++ b/drivers/input/misc/atmel_captouch.c @@ -161,8 +161,7 @@ static irqreturn_t atmel_captouch_isr(int irq, void *data) /* * Probe function to setup the device, input system and interrupt */ -static int atmel_captouch_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int atmel_captouch_probe(struct i2c_client *client) { struct atmel_captouch_device *capdev; struct device *dev = &client->dev; @@ -264,7 +263,7 @@ static const struct i2c_device_id atmel_captouch_id[] = { MODULE_DEVICE_TABLE(i2c, atmel_captouch_id); static struct i2c_driver atmel_captouch_driver = { - .probe = atmel_captouch_probe, + .probe_new = atmel_captouch_probe, .id_table = atmel_captouch_id, .driver = { .name = "atmel_captouch",