summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-08 23:19:22 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-08 23:19:22 -0300
commit4f1a121a633c3de1bd905b3becd57955b5e2b608 (patch)
tree859303f993775836463f03b441a938f9e6541be8 /linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
parent02e085b956ce32aa54ff3a2e938a0919ac75c643 (diff)
parentaca3b2a0241d96ebe7198577dd48ba46b3e8079f (diff)
downloadmediapointer-dvb-s2-4f1a121a633c3de1bd905b3becd57955b5e2b608.tar.gz
mediapointer-dvb-s2-4f1a121a633c3de1bd905b3becd57955b5e2b608.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/dvb-pll-conv
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-vp3054-i2c.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-vp3054-i2c.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 59802d9ee..dc97f4686 100644
--- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -117,10 +117,6 @@ static struct i2c_adapter vp3054_i2c_adap_template = {
.id = I2C_HW_B_CX2388x,
};
-static struct i2c_client vp3054_i2c_client_template = {
- .name = "VP-3054",
-};
-
int vp3054_i2c_probe(struct cx8802_dev *dev)
{
struct cx88_core *core = dev->core;
@@ -139,8 +135,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
sizeof(vp3054_i2c->adap));
memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
sizeof(vp3054_i2c->algo));
- memcpy(&vp3054_i2c->client, &vp3054_i2c_client_template,
- sizeof(vp3054_i2c->client));
#ifdef I2C_CLASS_TV_DIGITAL
vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
@@ -154,7 +148,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
vp3054_i2c->algo.data = dev;
i2c_set_adapdata(&vp3054_i2c->adap, dev);
vp3054_i2c->adap.algo_data = &vp3054_i2c->algo;
- vp3054_i2c->client.adapter = &vp3054_i2c->adap;
vp3054_bit_setscl(dev,1);
vp3054_bit_setsda(dev,1);