22 files changed, 153 insertions, 122 deletions

diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index c9ae70a37a6c..854808b67fae 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -364,14 +364,12 @@ from the remove() callback ensures that this is always done correctly.
 
 The bridge driver also has some helper functions it can use:
 
-struct v4l2_subdev *sd = v4l2_i2c_new_subdev(adapter, "module_foo", "chipid", 0x36);
+struct v4l2_subdev *sd = v4l2_i2c_new_subdev(v4l2_dev, adapter,
+               "module_foo", "chipid", 0x36);
 
 This loads the given module (can be NULL if no module needs to be loaded) and
 calls i2c_new_device() with the given i2c_adapter and chip/address arguments.
-If all goes well, then it registers the subdev with the v4l2_device. It gets
-the v4l2_device by calling i2c_get_adapdata(adapter), so you should make sure
-to call i2c_set_adapdata(adapter, v4l2_device) when you setup the i2c_adapter
-in your driver.
+If all goes well, then it registers the subdev with the v4l2_device.
 
 You can also use v4l2_i2c_new_probed_subdev() which is very similar to
 v4l2_i2c_new_subdev(), except that it has an array of possible I2C addresses
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");
 
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index b9c3ba51fb86..ced777084ca0 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -3512,12 +3512,15 @@ void __devinit bttv_init_card2(struct bttv *btv)
 
                 /* Load tuner module before issuing tuner config call! */
                 if (bttv_tvcards[btv->c.type].has_radio)
-                        v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tuner", "tuner", v4l2_i2c_tuner_addrs(ADDRS_RADIO));
-                v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
-                v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));
+                        v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_RADIO));
+                v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));
 
                 tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
                 tun_setup.type = btv->tuner_type;
@@ -3570,8 +3573,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 };
                 struct v4l2_subdev *sd;
 
-                sd = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "saa6588", "saa6588", addrs);
+                sd = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "saa6588", "saa6588", addrs);
                 btv->has_saa6588 = (sd != NULL);
         }
 
@@ -3595,8 +3598,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         I2C_CLIENT_END
                 };
 
-                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "msp3400", "msp3400", addrs);
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "msp3400", "msp3400", addrs);
                 if (btv->sd_msp34xx)
                         return;
                 goto no_audio;
@@ -3609,16 +3612,16 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         I2C_CLIENT_END
                 };
 
-                if (v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tda7432", "tda7432", addrs))
+                if (v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tda7432", "tda7432", addrs))
                         return;
                 goto no_audio;
         }
 
         case 3: {
                 /* The user specified that we should probe for tvaudio */
-                btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tvaudio", "tvaudio", tvaudio_addrs);
+                btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "tvaudio", "tvaudio", tvaudio_addrs);
                 if (btv->sd_tvaudio)
                         return;
                 goto no_audio;
@@ -3642,16 +3645,16 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         I2C_CLIENT_END
                 };
 
-                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "msp3400", "msp3400", addrs);
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "msp3400", "msp3400", addrs);
         } else if (bttv_tvcards[btv->c.type].msp34xx_alt) {
                 static const unsigned short addrs[] = {
                         I2C_ADDR_MSP3400_ALT >> 1,
                         I2C_CLIENT_END
                 };
 
-                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "msp3400", "msp3400", addrs);
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "msp3400", "msp3400", addrs);
         }
 
         /* If we found a msp34xx, then we're done. */
@@ -3665,14 +3668,14 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         I2C_CLIENT_END
                 };
 
-                if (v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tda7432", "tda7432", addrs))
+                if (v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tda7432", "tda7432", addrs))
                         return;
         }
 
         /* Now see if we can find one of the tvaudio devices. */
-        btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                        "tvaudio", "tvaudio", tvaudio_addrs);
+        btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                &btv->c.i2c_adap, "tvaudio", "tvaudio", tvaudio_addrs);
         if (btv->sd_tvaudio)
                 return;
 
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 7abe94d9fb4c..5f582726985d 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1954,7 +1954,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
                 goto out_freeirq;
 
         cam->sensor_addr = 0x42;
-        cam->sensor = v4l2_i2c_new_subdev(&cam->i2c_adapter,
+        cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter,
                         "ov7670", "ov7670", cam->sensor_addr);
         if (cam->sensor == NULL) {
                 ret = -ENODEV;
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index d092643faf46..b9b7064a2be8 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -100,16 +100,16 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
 
         if (hw == CX18_HW_TUNER) {
                 /* special tuner group handling */
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
-                                                cx->card_i2c->radio);
+                sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
+                                adap, mod, type, cx->card_i2c->radio);
                 if (sd != NULL)
                         sd->grp_id = hw;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
-                                                cx->card_i2c->demod);
+                sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
+                                adap, mod, type, cx->card_i2c->demod);
                 if (sd != NULL)
                         sd->grp_id = hw;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
-                                                cx->card_i2c->tv);
+                sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
+                                adap, mod, type, cx->card_i2c->tv);
                 if (sd != NULL)
                         sd->grp_id = hw;
                 return sd != NULL ? 0 : -1;
@@ -120,7 +120,7 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
                 return -1;
 
         /* It's an I2C device other than an analog tuner */
-        sd = v4l2_i2c_new_subdev(adap, mod, type, hw_addrs[idx]);
+        sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, mod, type, hw_addrs[idx]);
         if (sd != NULL)
                 sd->grp_id = hw;
         return sd != NULL ? 0 : -1;
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index b63719fddee4..f209fe14f829 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -311,8 +311,8 @@ void cx231xx_card_setup(struct cx231xx *dev)
 
         /* request some modules */
         if (dev->board.decoder == CX231XX_AVDECODER) {
-                dev->sd_cx25840 =
-                        v4l2_i2c_new_subdev(&dev->i2c_bus[0].i2c_adap,
+                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                        &dev->i2c_bus[0].i2c_adap,
                                         "cx25840", "cx25840", 0x88 >> 1);
                 if (dev->sd_cx25840 == NULL)
                         cx231xx_info("cx25840 subdev registration failure\n");
@@ -321,8 +321,8 @@ void cx231xx_card_setup(struct cx231xx *dev)
         }
 
         if (dev->board.tuner_type != TUNER_ABSENT) {
-                dev->sd_tuner =
-                        v4l2_i2c_new_subdev(&dev->i2c_bus[1].i2c_adap,
+                dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", 0xc2 >> 1);
                 if (dev->sd_tuner == NULL)
                         cx231xx_info("tuner subdev registration failure\n");
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index fe8525517c4e..a3c0565be1a9 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -739,7 +739,8 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
-                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->i2c_bus[2].i2c_adap,
+                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", "cx25840", 0x88 >> 1);
                 v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
                 break;
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 41f0a2b11872..ce7b3f8cdc65 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1523,10 +1523,12 @@ int cx23885_video_register(struct cx23885_dev *dev)
                 struct v4l2_subdev *sd = NULL;
 
                 if (dev->tuner_addr)
-                        sd = v4l2_i2c_new_subdev(&dev->i2c_bus[1].i2c_adap,
+                        sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", dev->tuner_addr);
                 else
-                        sd = v4l2_i2c_new_probed_subdev(&dev->i2c_bus[1].i2c_adap,
+                        sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", v4l2_i2c_tuner_addrs(ADDRS_TV));
                 if (sd) {
                         struct tuner_setup tun_setup;
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);
                 }
         }
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index fb0764af6c77..d7d4d2a6ed9d 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1882,7 +1882,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         /* load and configure helper modules */
 
         if (core->board.audio_chip == V4L2_IDENT_WM8775)
-                v4l2_i2c_new_subdev(&core->i2c_adap,
+                v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
                                 "wm8775", "wm8775", 0x36 >> 1);
 
         if (core->board.audio_chip == V4L2_IDENT_TVAUDIO) {
@@ -1892,7 +1892,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                         0xb0 >> 1, I2C_CLIENT_END
                 };
 
-                v4l2_i2c_new_probed_subdev(&core->i2c_adap,
+                v4l2_i2c_new_probed_subdev(&core->v4l2_dev, &core->i2c_adap,
                                 "tvaudio", "tvaudio", i2c_addr);
         }
 
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);
                 }
         }
 
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index e73a196ecc7a..1a289fd33cd4 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -161,15 +161,18 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
                 return -1;
         if (hw == IVTV_HW_TUNER) {
                 /* special tuner handling */
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
+                sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+                                adap, mod, type,
                                 itv->card_i2c->radio);
                 if (sd)
                         sd->grp_id = 1 << idx;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
+                sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+                                adap, mod, type,
                                 itv->card_i2c->demod);
                 if (sd)
                         sd->grp_id = 1 << idx;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
+                sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+                                adap, mod, type,
                                 itv->card_i2c->tv);
                 if (sd)
                         sd->grp_id = 1 << idx;
@@ -180,9 +183,11 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
         if (hw == IVTV_HW_UPD64031A || hw == IVTV_HW_UPD6408X) {
                 unsigned short addrs[2] = { hw_addrs[idx], I2C_CLIENT_END };
 
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type, addrs);
+                sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+                                adap, mod, type, addrs);
         } else {
-                sd = v4l2_i2c_new_subdev(adap, mod, type, hw_addrs[idx]);
+                sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
+                                adap, mod, type, hw_addrs[idx]);
         }
         if (sd)
                 sd->grp_id = 1 << idx;
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 238bb40ae098..6a52b1d5f7ba 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -168,13 +168,20 @@ static int mxb_probe(struct saa7146_dev *dev)
                 return -EFAULT;
         }
 
-        mxb->saa7111a = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "saa7115", "saa7111", I2C_SAA7111A);
-        mxb->tea6420_1 = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tea6420", "tea6420", I2C_TEA6420_1);
-        mxb->tea6420_2 = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tea6420", "tea6420", I2C_TEA6420_2);
-        mxb->tea6415c = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tea6415c", "tea6415c", I2C_TEA6415C);
-        mxb->tda9840 = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tda9840", "tda9840", I2C_TDA9840);
-        mxb->tuner = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tuner", "tuner", I2C_TUNER);
-        if (v4l2_i2c_new_subdev(&mxb->i2c_adapter, "saa5246a", "saa5246a", I2C_SAA5246A)) {
+        mxb->saa7111a = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "saa7115", "saa7111", I2C_SAA7111A);
+        mxb->tea6420_1 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tea6420", "tea6420", I2C_TEA6420_1);
+        mxb->tea6420_2 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tea6420", "tea6420", I2C_TEA6420_2);
+        mxb->tea6415c = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tea6415c", "tea6415c", I2C_TEA6415C);
+        mxb->tda9840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tda9840", "tda9840", I2C_TDA9840);
+        mxb->tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tuner", "tuner", I2C_TUNER);
+        if (v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "saa5246a", "saa5246a", I2C_SAA5246A)) {
                 printk(KERN_INFO "mxb: found teletext decoder\n");
         }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 2ee9d4d4c55c..d9d974a8f52a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2039,7 +2039,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                            "Module ID %u:"
                            " Setting up with specified i2c address 0x%x",
                            mid, i2caddr[0]);
-                sd = v4l2_i2c_new_subdev(&hdw->i2c_adap,
+                sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                          fname, fname,
                                          i2caddr[0]);
         } else {
@@ -2047,7 +2047,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                            "Module ID %u:"
                            " Setting up with address probe list",
                            mid);
-                sd = v4l2_i2c_new_probed_subdev(&hdw->i2c_adap,
+                sd = v4l2_i2c_new_probed_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                                 fname, fname,
                                                 i2caddr);
         }
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index a790a7246a63..e2ffc6756dcc 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -6599,20 +6599,24 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 /* Note: radio tuner address is always filled in,
                    so we do not need to probe for a radio tuner device. */
                 if (dev->radio_type != UNSET)
-                        v4l2_i2c_new_subdev(&dev->i2c_adap,
-                                "tuner", "tuner", dev->radio_addr);
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                dev->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 == ADDR_UNSET) {
                         enum v4l2_i2c_tuner_type type =
                                 has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
 
-                        v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(type));
+                        v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(type));
                 } 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);
                 }
         }
 
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index ef15f1cb92e4..234f530f0d74 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -982,7 +982,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         /* load i2c helpers */
         if (card_is_empress(dev)) {
                 struct v4l2_subdev *sd =
-                        v4l2_i2c_new_subdev(&dev->i2c_adap,
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
                                 "saa6752hs", "saa6752hs",
                                 saa7134_boards[dev->board].empress_addr);
 
@@ -995,8 +995,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                 struct v4l2_subdev *sd;
 
                 addrs[0] = saa7134_boards[dev->board].rds_addr;
-                sd = v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "saa6588",
-                            "saa6588", addrs);
+                sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "saa6588", "saa6588", addrs);
                 if (sd)
                         printk(KERN_INFO "%s: found RDS decoder\n", dev->name);
         }
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index dd2f8f27c73b..83778267175d 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -247,7 +247,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
         switch (usbvision_device_data[usbvision->DevModel].Codec) {
         case CODEC_SAA7113:
         case CODEC_SAA7111:
-                v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "saa7115",
+                v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+                                &usbvision->i2c_adap, "saa7115",
                                 "saa7115_auto", saa711x_addrs);
                 break;
         }
@@ -256,13 +257,15 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
                 enum v4l2_i2c_tuner_type type;
                 struct tuner_setup tun_setup;
 
-                sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner",
+                sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+                                &usbvision->i2c_adap, "tuner",
                                 "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                 /* depending on whether we found a demod or not, select
                    the tuner type. */
                 type = sd ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
 
-                sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner",
+                sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+                                &usbvision->i2c_adap, "tuner",
                                 "tuner", v4l2_i2c_tuner_addrs(type));
 
                 if (usbvision->tuner_type != -1) {
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 270833b1b38f..f576ef66b807 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -760,18 +760,16 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
 
 
 
-/* Load an i2c sub-device. It assumes that i2c_get_adapdata(adapter)
-   returns the v4l2_device and that i2c_get_clientdata(client)
-   returns the v4l2_subdev. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+/* Load an i2c sub-device. */
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type, u8 addr)
 {
-        struct v4l2_device *dev = i2c_get_adapdata(adapter);
         struct v4l2_subdev *sd = NULL;
         struct i2c_client *client;
         struct i2c_board_info info;
 
-        BUG_ON(!dev);
+        BUG_ON(!v4l2_dev);
 
         if (module_name)
                 request_module(module_name);
@@ -798,7 +796,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
 
         /* Register with the v4l2_device which increases the module's
            use count as well. */
-        if (v4l2_device_register_subdev(dev, sd))
+        if (v4l2_device_register_subdev(v4l2_dev, sd))
                 sd = NULL;
         /* Decrease the module use count to match the first try_module_get. */
         module_put(client->driver->driver.owner);
@@ -812,19 +810,17 @@ error:
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
 
-/* Probe and load an i2c sub-device. It assumes that i2c_get_adapdata(adapter)
-   returns the v4l2_device and that i2c_get_clientdata(client)
-   returns the v4l2_subdev. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+/* Probe and load an i2c sub-device. */
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+        struct i2c_adapter *adapter,
         const char *module_name, const char *client_type,
         const unsigned short *addrs)
 {
-        struct v4l2_device *dev = i2c_get_adapdata(adapter);
         struct v4l2_subdev *sd = NULL;
         struct i2c_client *client = NULL;
         struct i2c_board_info info;
 
-        BUG_ON(!dev);
+        BUG_ON(!v4l2_dev);
 
         if (module_name)
                 request_module(module_name);
@@ -850,7 +846,7 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
 
         /* Register with the v4l2_device which increases the module's
            use count as well. */
-        if (v4l2_device_register_subdev(dev, sd))
+        if (v4l2_device_register_subdev(v4l2_dev, sd))
                 sd = NULL;
         /* Decrease the module use count to match the first try_module_get. */
         module_put(client->driver->driver.owner);
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index c39a2d4d5178..94343758ff5f 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -4337,11 +4337,13 @@ static int __init vino_module_init(void)
         vino_init_stage++;
 
         addr[0] = 0x45;
-        vino_drvdata->decoder = v4l2_i2c_new_probed_subdev(&vino_i2c_adapter,
-                        "saa7191", "saa7191", addr);
+        vino_drvdata->decoder =
+                v4l2_i2c_new_probed_subdev(&vino_drvdata->v4l2_dev,
+                        &vino_i2c_adapter, "saa7191", "saa7191", addr);
         addr[0] = 0x2b;
-        vino_drvdata->camera = v4l2_i2c_new_probed_subdev(&vino_i2c_adapter,
-                        "indycam", "indycam", addr);
+        vino_drvdata->camera =
+                v4l2_i2c_new_probed_subdev(&vino_drvdata->v4l2_dev,
+                        &vino_i2c_adapter, "indycam", "indycam", addr);
 
         dprintk("init complete!\n");
 
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index df181e86f9cb..f59b2bd07e89 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -3523,7 +3523,8 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         w9968cf_turn_on_led(cam);
 
         w9968cf_i2c_init(cam);
-        cam->sensor_sd = v4l2_i2c_new_probed_subdev(&cam->i2c_adapter,
+        cam->sensor_sd = v4l2_i2c_new_probed_subdev(&cam->v4l2_dev,
+                        &cam->i2c_adapter,
                         "ovcamchip", "ovcamchip", addrs);
 
         usb_set_intfdata(intf, cam);
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index f91bba435ed5..1ef70b090c4c 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1360,11 +1360,13 @@ static int __devinit zoran_probe(struct pci_dev *pdev,
                 goto zr_free_irq;
         }
 
-        zr->decoder = v4l2_i2c_new_probed_subdev(&zr->i2c_adapter,
-                zr->card.mod_decoder, zr->card.i2c_decoder, zr->card.addrs_decoder);
+        zr->decoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+                &zr->i2c_adapter, zr->card.mod_decoder, zr->card.i2c_decoder,
+                zr->card.addrs_decoder);
 
         if (zr->card.mod_encoder)
-                zr->encoder = v4l2_i2c_new_probed_subdev(&zr->i2c_adapter,
+                zr->encoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+                        &zr->i2c_adapter,
                         zr->card.mod_encoder, zr->card.i2c_encoder,
                         zr->card.addrs_encoder);
 
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 1613a0ab8b04..01302f19bc91 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -139,12 +139,14 @@ struct v4l2_subdev_ops;
 /* Load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type, u8 addr);
 /* Probe and load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type,
                 const unsigned short *addrs);
 /* Like v4l2_i2c_new_probed_subdev, except probe for a single address. */