media: i2c/saa7115: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:41:42 +0000 (23:41 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Sun, 22 Jan 2023 07:33:20 +0000 (08:33 +0100)
.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>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/i2c/saa7115.c

index 86e70a9..efeda39 100644 (file)
@@ -1804,9 +1804,9 @@ static int saa711x_detect_chip(struct i2c_client *client,
        return -ENODEV;
 }
 
-static int saa711x_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int saa711x_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct saa711x_state *state;
        struct v4l2_subdev *sd;
        struct v4l2_ctrl_handler *hdl;
@@ -1951,7 +1951,7 @@ static struct i2c_driver saa711x_driver = {
        .driver = {
                .name   = "saa7115",
        },
-       .probe          = saa711x_probe,
+       .probe_new      = saa711x_probe,
        .remove         = saa711x_remove,
        .id_table       = saa711x_id,
 };