diff mbox series

[264/606] Input: wacom_i2c - Convert to i2c's .probe_new()

Message ID 20221118224540.619276-265-uwe@kleine-koenig.org (mailing list archive)
State Mainlined
Commit 0a3098db138c494c9289ba11a558f33b9d389347
Headers show
Series i2c: Complete conversion to i2c_probe_new | expand

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/wacom_i2c.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Alistair Francis Nov. 18, 2022, 11:27 p.m. UTC | #1 
On Sat, 19 Nov 2022, at 8:39 AM, 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>

Reviewed-by: Alistair Francis <alistair@alistair23.me>

> ---
> drivers/input/touchscreen/wacom_i2c.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> index 141754b2764c..c9188ee00c62 100644
> --- a/drivers/input/touchscreen/wacom_i2c.c
> +++ b/drivers/input/touchscreen/wacom_i2c.c
> @@ -162,8 +162,7 @@ static void wacom_i2c_close(struct input_dev *dev)
> disable_irq(client->irq);
> }
>  
> -static int wacom_i2c_probe(struct i2c_client *client,
> -    const struct i2c_device_id *id)
> +static int wacom_i2c_probe(struct i2c_client *client)
> {
> struct device *dev = &client->dev;
> struct wacom_i2c *wac_i2c;
> @@ -265,7 +264,7 @@ static struct i2c_driver wacom_i2c_driver = {
> .pm = &wacom_i2c_pm,
> },
>  
> - .probe = wacom_i2c_probe,
> + .probe_new = wacom_i2c_probe,
> .id_table = wacom_i2c_id,
> };
> module_i2c_driver(wacom_i2c_driver);
> -- 
> 2.38.1
> 
>
diff mbox series

Patch

diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 141754b2764c..c9188ee00c62 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -162,8 +162,7 @@  static void wacom_i2c_close(struct input_dev *dev)
 	disable_irq(client->irq);
 }
 
-static int wacom_i2c_probe(struct i2c_client *client,
-			   const struct i2c_device_id *id)
+static int wacom_i2c_probe(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;
 	struct wacom_i2c *wac_i2c;
@@ -265,7 +264,7 @@  static struct i2c_driver wacom_i2c_driver = {
 		.pm	= &wacom_i2c_pm,
 	},
 
-	.probe		= wacom_i2c_probe,
+	.probe_new	= wacom_i2c_probe,
 	.id_table	= wacom_i2c_id,
 };
 module_i2c_driver(wacom_i2c_driver);