13 files changed, 0 insertions, 15 deletions

diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/video/au0828/au0828-i2c.c
index 13e494365e70..cbdb65c34f21 100644
--- a/drivers/media/video/au0828/au0828-i2c.c
+++ b/drivers/media/video/au0828/au0828-i2c.c
@@ -320,7 +320,6 @@ static struct i2c_algorithm au0828_i2c_algo_template = {
 static struct i2c_adapter au0828_i2c_adap_template = {
         .name              = DRIVER_NAME,
         .owner             = THIS_MODULE,
-        .id                = I2C_HW_B_AU0828,
         .algo              = &au0828_i2c_algo_template,
 };
 
diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c
index ebd1ee9dc871..beda363418b0 100644
--- a/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/drivers/media/video/bt8xx/bttv-i2c.c
@@ -352,7 +352,6 @@ int __devinit init_bttv_i2c(struct bttv *btv)
                 /* bt878 */
                 strlcpy(btv->c.i2c_adap.name, "bt878",
                         sizeof(btv->c.i2c_adap.name));
-                btv->c.i2c_adap.id = I2C_HW_B_BT848;    /* FIXME */
                 btv->c.i2c_adap.algo = &bttv_algo;
         } else {
                 /* bt848 */
@@ -362,7 +361,6 @@ int __devinit init_bttv_i2c(struct bttv *btv)
 
                 strlcpy(btv->c.i2c_adap.name, "bttv",
                         sizeof(btv->c.i2c_adap.name));
-                btv->c.i2c_adap.id = I2C_HW_B_BT848;
                 memcpy(&btv->i2c_algo, &bttv_i2c_algo_bit_template,
                        sizeof(bttv_i2c_algo_bit_template));
                 btv->i2c_algo.udelay = i2c_udelay;
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index c4d181dde1ca..9c149a781294 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -490,7 +490,6 @@ static int cafe_smbus_setup(struct cafe_camera *cam)
         int ret;
 
         cafe_smbus_enable_irq(cam);
-        adap->id = I2C_HW_SMBUS_CAFE;
         adap->owner = THIS_MODULE;
         adap->algo = &cafe_smbus_algo;
         strcpy(adap->name, "cafe_ccic");
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 8591e4fc359f..237d84841b26 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -190,7 +190,6 @@ static int cx18_getsda(void *data)
 /* template for i2c-bit-algo */
 static struct i2c_adapter cx18_i2c_adap_template = {
         .name = "cx18 i2c driver",
-        .id = I2C_HW_B_CX2341X,
         .algo = NULL,                   /* set by i2c-algo-bit */
         .algo_data = NULL,              /* filled from template */
         .owner = THIS_MODULE,
diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c
index 33219dc4d649..58d9cc0867b9 100644
--- a/drivers/media/video/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/video/cx231xx/cx231xx-i2c.c
@@ -432,7 +432,6 @@ static struct i2c_algorithm cx231xx_algo = {
 static struct i2c_adapter cx231xx_adap_template = {
         .owner = THIS_MODULE,
         .name = "cx231xx",
-        .id = I2C_HW_B_CX231XX,
         .algo = &cx231xx_algo,
 };
 
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 384dec34134f..4172cb387420 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -283,7 +283,6 @@ static struct i2c_algorithm cx23885_i2c_algo_template = {
 static struct i2c_adapter cx23885_i2c_adap_template = {
         .name              = "cx23885",
         .owner             = THIS_MODULE,
-        .id                = I2C_HW_B_CX23885,
         .algo              = &cx23885_i2c_algo_template,
 };
 
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 27e33a287dfc..71474d31e155 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -459,7 +459,6 @@ static struct i2c_algorithm em28xx_algo = {
 static struct i2c_adapter em28xx_adap_template = {
         .owner = THIS_MODULE,
         .name = "em28xx",
-        .id = I2C_HW_B_EM28XX,
         .algo = &em28xx_algo,
 };
 
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index c4b5d1515c10..296330a0e1e5 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -127,7 +127,6 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
                 sizeof(i2c_adap->name));
         i2c_adap->algo  = &hdpvr_algo;
         i2c_adap->class = I2C_CLASS_TV_ANALOG;
-        i2c_adap->id    = I2C_HW_B_HDPVR;
         i2c_adap->owner = THIS_MODULE;
         i2c_adap->dev.parent = &dev->udev->dev;
 
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index e52aa322b134..8f15a31d3f66 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -509,7 +509,6 @@ static struct i2c_algorithm ivtv_algo = {
 /* template for our-bit banger */
 static struct i2c_adapter ivtv_i2c_adap_hw_template = {
         .name = "ivtv i2c driver",
-        .id = I2C_HW_B_CX2341X,
         .algo = &ivtv_algo,
         .algo_data = NULL,                      /* filled from template */
         .owner = THIS_MODULE,
@@ -560,7 +559,6 @@ static int ivtv_getsda_old(void *data)
 /* template for i2c-bit-algo */
 static struct i2c_adapter ivtv_i2c_adap_template = {
         .name = "ivtv i2c driver",
-        .id = I2C_HW_B_CX2341X,
         .algo = NULL,                   /* set by i2c-algo-bit */
         .algo_data = NULL,              /* filled from template */
         .owner = THIS_MODULE,
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 610bd848df24..a334b1a966a2 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -540,7 +540,6 @@ static struct i2c_algorithm pvr2_i2c_algo_template = {
 static struct i2c_adapter pvr2_i2c_adap_template = {
         .owner         = THIS_MODULE,
         .class         = 0,
-        .id            = I2C_HW_B_BT848,
 };
 
 
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 97b082fe4473..f3b6e15d91f2 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -1776,7 +1776,6 @@ static struct i2c_algo_sgi_data i2c_sgi_vino_data = {
 
 static struct i2c_adapter vino_i2c_adapter = {
         .name                   = "VINO I2C bus",
-        .id                     = I2C_HW_SGI_VINO,
         .algo                   = &sgi_algo,
         .algo_data              = &i2c_sgi_vino_data,
         .owner                  = THIS_MODULE,
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 6c3f23e31b5c..602484dd3da9 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -1497,7 +1497,6 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
         };
 
         static struct i2c_adapter adap = {
-                .id =                I2C_HW_SMBUS_W9968CF,
                 .owner =             THIS_MODULE,
                 .algo =              &algo,
         };
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 03dc2f3cf84a..40d07faa4a24 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -732,7 +732,6 @@ zoran_register_i2c (struct zoran *zr)
         memcpy(&zr->i2c_algo, &zoran_i2c_bit_data_template,
                sizeof(struct i2c_algo_bit_data));
         zr->i2c_algo.data = zr;
-        zr->i2c_adapter.id = I2C_HW_B_ZR36067;
         strlcpy(zr->i2c_adapter.name, ZR_DEVNAME(zr),
                 sizeof(zr->i2c_adapter.name));
         i2c_set_adapdata(&zr->i2c_adapter, &zr->v4l2_dev);