media: i2c/msp3400-driver: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:41:23 +0000 (23:41 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Sun, 22 Jan 2023 07:33:16 +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/msp3400-driver.c

index 4ce7a15..12032e2 100644 (file)
@@ -663,8 +663,9 @@ static const char * const opmode_str[] = {
        [OPMODE_AUTOSELECT] = "autodetect and autoselect",
 };
 
-static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int msp_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct msp_state *state;
        struct v4l2_subdev *sd;
        struct v4l2_ctrl_handler *hdl;
@@ -891,7 +892,7 @@ static struct i2c_driver msp_driver = {
                .name   = "msp3400",
                .pm     = &msp3400_pm_ops,
        },
-       .probe          = msp_probe,
+       .probe_new      = msp_probe,
        .remove         = msp_remove,
        .id_table       = msp_id,
 };