The probe function doesn't make use of the i2c_device_id * parameter so
it can be trivially converted.
Reviewed-by: Kieran Bingham <[email protected]>
Link: https://lore.kernel.org/lkml/[email protected]
Signed-off-by: Uwe Kleine-König <[email protected]>
---
drivers/media/i2c/ov2685.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c
index a3b524f15d89..1c80b121e7d6 100644
--- a/drivers/media/i2c/ov2685.c
+++ b/drivers/media/i2c/ov2685.c
@@ -707,8 +707,7 @@ static int ov2685_configure_regulators(struct ov2685 *ov2685)
ov2685->supplies);
}
-static int ov2685_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int ov2685_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct ov2685 *ov2685;
@@ -830,7 +829,7 @@ static struct i2c_driver ov2685_i2c_driver = {
.pm = &ov2685_pm_ops,
.of_match_table = of_match_ptr(ov2685_of_match),
},
- .probe = &ov2685_probe,
+ .probe_new = &ov2685_probe,
.remove = &ov2685_remove,
};
--
2.39.1
On 24/02/2023 13:05, Uwe Kleine-König wrote:
> The probe function doesn't make use of the i2c_device_id * parameter so
> it can be trivially converted.
>
> Reviewed-by: Kieran Bingham <[email protected]>
Acked-by: Hans Verkuil <[email protected]>
> Link: https://lore.kernel.org/lkml/[email protected]
> Signed-off-by: Uwe Kleine-König <[email protected]>
> ---
> drivers/media/i2c/ov2685.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c
> index a3b524f15d89..1c80b121e7d6 100644
> --- a/drivers/media/i2c/ov2685.c
> +++ b/drivers/media/i2c/ov2685.c
> @@ -707,8 +707,7 @@ static int ov2685_configure_regulators(struct ov2685 *ov2685)
> ov2685->supplies);
> }
>
> -static int ov2685_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int ov2685_probe(struct i2c_client *client)
> {
> struct device *dev = &client->dev;
> struct ov2685 *ov2685;
> @@ -830,7 +829,7 @@ static struct i2c_driver ov2685_i2c_driver = {
> .pm = &ov2685_pm_ops,
> .of_match_table = of_match_ptr(ov2685_of_match),
> },
> - .probe = &ov2685_probe,
> + .probe_new = &ov2685_probe,
> .remove = &ov2685_remove,
> };
>