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, 4 insertions, 4 deletions

diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index abba48b154c5..053bbe8c8e3a 100644
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -211,8 +211,8 @@ void au0828_card_setup(struct au0828_dev *dev)
                 /* Load the analog demodulator driver (note this would need to
                    be abstracted out if we ever need to support a different
                    demod) */
-                sd = v4l2_i2c_new_subdev(&dev->i2c_adap, "au8522", "au8522",
-                                         0x8e >> 1);
+                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "au8522", "au8522", 0x8e >> 1);
                 if (sd == NULL)
                         printk(KERN_ERR "analog subdev registration failed\n");
         }
@@ -220,8 +220,8 @@ void au0828_card_setup(struct au0828_dev *dev)
         /* Setup tuners */
         if (dev->board.tuner_type != TUNER_ABSENT) {
                 /* Load the tuner module, which does the attach */
-                sd = v4l2_i2c_new_subdev(&dev->i2c_adap, "tuner", "tuner",
-                                         dev->board.tuner_addr);
+                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "tuner", "tuner", dev->board.tuner_addr);
                 if (sd == NULL)
                         printk(KERN_ERR "tuner subdev registration fail\n");