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, 9 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 84ecfb291276..6bbbfc66bb4b 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -3221,16 +3221,19 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
                    The radio_type is sometimes missing, or set to UNSET but
                    later code configures a tea5767.
                  */
-                v4l2_i2c_new_probed_subdev(&core->i2c_adap, "tuner", "tuner",
+                v4l2_i2c_new_probed_subdev(&core->v4l2_dev, &core->i2c_adap,
+                                "tuner", "tuner",
                                 v4l2_i2c_tuner_addrs(ADDRS_RADIO));
                 if (has_demod)
-                        v4l2_i2c_new_probed_subdev(&core->i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                        v4l2_i2c_new_probed_subdev(&core->v4l2_dev,
+                                &core->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                 if (core->board.tuner_addr == ADDR_UNSET) {
-                        v4l2_i2c_new_probed_subdev(&core->i2c_adap, "tuner",
-                                "tuner", has_demod ? tv_addrs + 4 : tv_addrs);
+                        v4l2_i2c_new_probed_subdev(&core->v4l2_dev,
+                                &core->i2c_adap, "tuner", "tuner",
+                                has_demod ? tv_addrs + 4 : tv_addrs);
                 } else {
-                        v4l2_i2c_new_subdev(&core->i2c_adap,
+                        v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
                                 "tuner", "tuner", core->board.tuner_addr);
                 }
         }