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/mouse/elan_i2c_core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index d4eb59b55bf1..a25d5b055553 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1188,8 +1188,7 @@ static void elan_disable_regulator(void *_data)
regulator_disable(data->vcc);
}
-static int elan_probe(struct i2c_client *client,
- const struct i2c_device_id *dev_id)
+static int elan_probe(struct i2c_client *client)
{
const struct elan_transport_ops *transport_ops;
struct device *dev = &client->dev;
@@ -1438,7 +1437,7 @@ static struct i2c_driver elan_driver = {
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
.dev_groups = elan_sysfs_groups,
},
- .probe = elan_probe,
+ .probe_new = elan_probe,
.id_table = elan_id,
};
--
2.38.1
Hi,
On 11/18/22 23:39, 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]>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <[email protected]>
Regards,
Hans
> ---
> drivers/input/mouse/elan_i2c_core.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
> index d4eb59b55bf1..a25d5b055553 100644
> --- a/drivers/input/mouse/elan_i2c_core.c
> +++ b/drivers/input/mouse/elan_i2c_core.c
> @@ -1188,8 +1188,7 @@ static void elan_disable_regulator(void *_data)
> regulator_disable(data->vcc);
> }
>
> -static int elan_probe(struct i2c_client *client,
> - const struct i2c_device_id *dev_id)
> +static int elan_probe(struct i2c_client *client)
> {
> const struct elan_transport_ops *transport_ops;
> struct device *dev = &client->dev;
> @@ -1438,7 +1437,7 @@ static struct i2c_driver elan_driver = {
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> .dev_groups = elan_sysfs_groups,
> },
> - .probe = elan_probe,
> + .probe_new = elan_probe,
> .id_table = elan_id,
> };
>