diff mbox series

[390/606] media: i2c/video-i2c: Convert to i2c's .probe_new()

Message ID 20221118224540.619276-391-uwe@kleine-koenig.org
State Not Applicable
Headers show
Series i2c: Complete conversion to i2c_probe_new | expand

Commit Message

Uwe Kleine-König Nov. 18, 2022, 10:42 p.m. UTC 
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/media/i2c/video-i2c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Matt Ranostay Nov. 19, 2022, 5:51 a.m. UTC | #1 
On Sat, Nov 19, 2022 at 6:47 AM Uwe Kleine-König <uwe@kleine-koenig.org> wrote:
>
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>
> .probe_new() doesn't get the i2c_device_id * parameter, so determine
> that explicitly in the probe function.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Looks good to me.

Acked-by: Matt Ranostay <matt.ranostay@konsulko.com>

> ---
>  drivers/media/i2c/video-i2c.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
> index f15ef2d13059..dddf9827b314 100644
> --- a/drivers/media/i2c/video-i2c.c
> +++ b/drivers/media/i2c/video-i2c.c
> @@ -757,9 +757,9 @@ static void video_i2c_release(struct video_device *vdev)
>         kfree(data);
>  }
>
> -static int video_i2c_probe(struct i2c_client *client,
> -                            const struct i2c_device_id *id)
> +static int video_i2c_probe(struct i2c_client *client)
>  {
> +       const struct i2c_device_id *id = i2c_client_get_device_id(client);
>         struct video_i2c_data *data;
>         struct v4l2_device *v4l2_dev;
>         struct vb2_queue *queue;
> @@ -959,7 +959,7 @@ static struct i2c_driver video_i2c_driver = {
>                 .of_match_table = video_i2c_of_match,
>                 .pm     = &video_i2c_pm_ops,
>         },
> -       .probe          = video_i2c_probe,
> +       .probe_new      = video_i2c_probe,
>         .remove         = video_i2c_remove,
>         .id_table       = video_i2c_id_table,
>  };
> --
> 2.38.1
>
diff mbox series

Patch

diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
index f15ef2d13059..dddf9827b314 100644
--- a/drivers/media/i2c/video-i2c.c
+++ b/drivers/media/i2c/video-i2c.c
@@ -757,9 +757,9 @@  static void video_i2c_release(struct video_device *vdev)
 	kfree(data);
 }
 
-static int video_i2c_probe(struct i2c_client *client,
-			     const struct i2c_device_id *id)
+static int video_i2c_probe(struct i2c_client *client)
 {
+	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct video_i2c_data *data;
 	struct v4l2_device *v4l2_dev;
 	struct vb2_queue *queue;
@@ -959,7 +959,7 @@  static struct i2c_driver video_i2c_driver = {
 		.of_match_table = video_i2c_of_match,
 		.pm	= &video_i2c_pm_ops,
 	},
-	.probe		= video_i2c_probe,
+	.probe_new	= video_i2c_probe,
 	.remove		= video_i2c_remove,
 	.id_table	= video_i2c_id_table,
 };