[PATCH] media: i2c: ov2685: convert to i2c's .probe_new()

[PATCH] media: i2c: ov2685: convert to i2c's .probe_new()

[Uwe Kleine-König]

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/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.38.1

Re: [PATCH] media: i2c: ov2685: convert to i2c's .probe_new()

[Kieran Bingham]

Hi Uwe,

Thanks for taking on this mammoth task! I've attempted it a couple of
times already, and been kept back by the sheer volume of patches it
generates.

Quoting Uwe Kleine-König (2022-11-21 10:28:38)
> The probe function doesn't make use of the i2c_device_id * parameter so
> it can be trivially converted.


Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  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.38.1
>

Re: [PATCH] media: i2c: ov2685: convert to i2c's .probe_new()

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 814 bytes --]

Hello,

On Mon, Nov 21, 2022 at 11:28:38AM +0100, Uwe Kleine-König wrote:
> The probe function doesn't make use of the i2c_device_id * parameter so
> it can be trivially converted.

Gentle ping! As of yesterday's next there are only <10 drivers left that
make use of the old .probe function. I'd like to complete the conversion
to .probe_new() after the next merge window. So I ask you to either take
this patch (and the similar ov5695 one) during the next merge window (my
preferred option), or accept that I will send it in a series with the
patch removing .probe() with the id parameter to be merged via the i2c
tree.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]