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

index 4e844b2..f26508b 100644 (file)
@@ -1760,9 +1760,9 @@ static struct i2c_adapter *m88ds3103_get_i2c_adapter(struct i2c_client *client)
        return dev->muxc->adapter[0];
 }
 
-static int m88ds3103_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int m88ds3103_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct m88ds3103_dev *dev;
        struct m88ds3103_platform_data *pdata = client->dev.platform_data;
        int ret;
@@ -1941,7 +1941,7 @@ static struct i2c_driver m88ds3103_driver = {
                .name   = "m88ds3103",
                .suppress_bind_attrs = true,
        },
-       .probe          = m88ds3103_probe,
+       .probe_new      = m88ds3103_probe,
        .remove         = m88ds3103_remove,
        .id_table       = m88ds3103_id_table,
 };