V4L/DVB (11373): v4l2-common: add explicit v4l2_device pointer as first arg to new_(probed)_subdev

The functions v4l2_i2c_new_subdev and v4l2_i2c_new_probed_subdev relied on
i2c_get_adapdata to return the v4l2_device. However, this is not always
possible on embedded platforms. So modify the API to pass the v4l2_device
pointer explicitly.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 18 insertions, 16 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index e7fc2d5b129e..7c70738479dd 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1958,44 +1958,46 @@ void em28xx_card_setup(struct em28xx *dev)
 
         /* request some modules */
         if (dev->board.has_msp34xx)
-                v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "msp3400",
-                        "msp3400", msp3400_addrs);
+                v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "msp3400", "msp3400", msp3400_addrs);
 
         if (dev->board.decoder == EM28XX_SAA711X)
-                v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "saa7115",
-                        "saa7115_auto", saa711x_addrs);
+                v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "saa7115", "saa7115_auto", saa711x_addrs);
 
         if (dev->board.decoder == EM28XX_TVP5150)
-                v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tvp5150",
-                        "tvp5150", tvp5150_addrs);
+                v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "tvp5150", "tvp5150", tvp5150_addrs);
 
         if (dev->board.adecoder == EM28XX_TVAUDIO)
-                v4l2_i2c_new_subdev(&dev->i2c_adap, "tvaudio",
-                        "tvaudio", dev->board.tvaudio_addr);
+                v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "tvaudio", "tvaudio", dev->board.tvaudio_addr);
 
         if (dev->board.tuner_type != TUNER_ABSENT) {
                 int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);
 
                 if (dev->board.radio.type)
-                        v4l2_i2c_new_subdev(&dev->i2c_adap, "tuner", "tuner",
-                                dev->board.radio_addr);
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "tuner", "tuner", dev->board.radio_addr);
 
                 if (has_demod)
-                        v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                        v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                 if (dev->tuner_addr == 0) {
                         enum v4l2_i2c_tuner_type type =
                                 has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
                         struct v4l2_subdev *sd;
 
-                        sd = v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(type));
+                        sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(type));
 
                         if (sd)
                                 dev->tuner_addr = v4l2_i2c_subdev_addr(sd);
                 } else {
-                        v4l2_i2c_new_subdev(&dev->i2c_adap, "tuner",
-                                "tuner", dev->tuner_addr);
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "tuner", "tuner", dev->tuner_addr);
                 }
         }