media: vidtv: Convert to i2c's .probe_new()

The probe functions doesn't make use of the i2c_device_id * parameter so it
can be trivially converted.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/test-drivers/vidtv/vidtv_demod.c b/drivers/media/test-drivers/vidtv/vidtv_demod.c
index e7959ab1add8d47ab7cde613a5300a8d17ad04e2..c2300b30407b1098e68ce7806f73c3b915eaf846 100644 (file)
--- a/drivers/media/test-drivers/vidtv/vidtv_demod.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_demod.c
@@ -412,8 +412,7 @@ static const struct i2c_device_id vidtv_demod_i2c_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, vidtv_demod_i2c_id_table);
 
-static int vidtv_demod_i2c_probe(struct i2c_client *client,
-                                const struct i2c_device_id *id)
+static int vidtv_demod_i2c_probe(struct i2c_client *client)
 {
        struct vidtv_tuner_config *config = client->dev.platform_data;
        struct vidtv_demod_state *state;
@@ -450,7 +449,7 @@ static struct i2c_driver vidtv_demod_i2c_driver = {
                .name                = "dvb_vidtv_demod",
                .suppress_bind_attrs = true,
        },
-       .probe    = vidtv_demod_i2c_probe,
+       .probe_new = vidtv_demod_i2c_probe,
        .remove   = vidtv_demod_i2c_remove,
        .id_table = vidtv_demod_i2c_id_table,
 };

diff --git a/drivers/media/test-drivers/vidtv/vidtv_tuner.c b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
index aabc97ed736b81462667428d78f6f8dbe7bf18c6..55a4387f3854e017cca6a46223cefa64bfdfb161 100644 (file)
--- a/drivers/media/test-drivers/vidtv/vidtv_tuner.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
@@ -390,8 +390,7 @@ static const struct i2c_device_id vidtv_tuner_i2c_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, vidtv_tuner_i2c_id_table);
 
-static int vidtv_tuner_i2c_probe(struct i2c_client *client,
-                                const struct i2c_device_id *id)
+static int vidtv_tuner_i2c_probe(struct i2c_client *client)
 {
        struct vidtv_tuner_config *config = client->dev.platform_data;
        struct dvb_frontend *fe           = config->fe;
@@ -426,7 +425,7 @@ static struct i2c_driver vidtv_tuner_i2c_driver = {
                .name                = "dvb_vidtv_tuner",
                .suppress_bind_attrs = true,
        },
-       .probe    = vidtv_tuner_i2c_probe,
+       .probe_new = vidtv_tuner_i2c_probe,
        .remove   = vidtv_tuner_i2c_remove,
        .id_table = vidtv_tuner_i2c_id_table,
 };