2022-11-18 23:51:41

by Uwe Kleine-König

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

From: Uwe Kleine-König <[email protected]>

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 <[email protected]>
---
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

2022-11-19 01:15:13

by Alistair Francis

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

On Sat, 19 Nov 2022, at 8:39 AM, Uwe Kleine-König wrote:
> From: Uwe Kleine-König <[email protected]>
>
> 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 <[email protected]>

Reviewed-by: Alistair Francis <[email protected]>

> ---
> 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
>
>