aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-30 07:05:12 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-30 09:17:19 -0500
commit6a23a520c07ba556ea2317b1f72f3d2eb002f991 (patch)
tree5a29e6f99469e183fbbf182e973b1e6ea6f6c136 /drivers
parentd7c7235695ef9cbbdc20bdeb8554dbf10f576ca1 (diff)
[media] cx88: Remove the obsolete i2c_adapter.id field
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx88/cx88-i2c.c1
-rw-r--r--drivers/media/video/cx88/cx88-vp3054-i2c.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index f53836bb6a5a..a1fe0abb6e43 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -146,7 +146,6 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
146 core->i2c_adap.dev.parent = &pci->dev; 146 core->i2c_adap.dev.parent = &pci->dev;
147 strlcpy(core->i2c_adap.name,core->name,sizeof(core->i2c_adap.name)); 147 strlcpy(core->i2c_adap.name,core->name,sizeof(core->i2c_adap.name));
148 core->i2c_adap.owner = THIS_MODULE; 148 core->i2c_adap.owner = THIS_MODULE;
149 core->i2c_adap.id = I2C_HW_B_CX2388x;
150 core->i2c_algo.udelay = i2c_udelay; 149 core->i2c_algo.udelay = i2c_udelay;
151 core->i2c_algo.data = core; 150 core->i2c_algo.data = core;
152 i2c_set_adapdata(&core->i2c_adap, &core->v4l2_dev); 151 i2c_set_adapdata(&core->i2c_adap, &core->v4l2_dev);
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index ec5476d8b10b..d77f8ecab9d7 100644
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -125,7 +125,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
125 strlcpy(vp3054_i2c->adap.name, core->name, 125 strlcpy(vp3054_i2c->adap.name, core->name,
126 sizeof(vp3054_i2c->adap.name)); 126 sizeof(vp3054_i2c->adap.name));
127 vp3054_i2c->adap.owner = THIS_MODULE; 127 vp3054_i2c->adap.owner = THIS_MODULE;
128 vp3054_i2c->adap.id = I2C_HW_B_CX2388x;
129 vp3054_i2c->algo.data = dev; 128 vp3054_i2c->algo.data = dev;
130 i2c_set_adapdata(&vp3054_i2c->adap, dev); 129 i2c_set_adapdata(&vp3054_i2c->adap, dev);
131 vp3054_i2c->adap.algo_data = &vp3054_i2c->algo; 130 vp3054_i2c->adap.algo_data = &vp3054_i2c->algo;