media: i2c/video-i2c: Convert to i2c's .probe_new()

.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>
Acked-by: Matt Ranostay <matt.ranostay@konsulko.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
index f15ef2d..dddf982 100644 (file)
--- 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,
 };