aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-i2c.c
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-09-04 20:32:41 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:08:21 -0400
commit2e52f215be1b3a0337788c8d3345bdf5e3894e19 (patch)
treebbb9dc7998095a301137a612e5488d7b9f111dab /drivers/media/video/cx23885/cx23885-i2c.c
parentf29379c3619d85e0bdc0ee30c8199f7f66866fcf (diff)
V4L/DVB (6170): cx23885: General cleanup of old code
Removed unused code. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-i2c.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-i2c.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 6b49b414aebf..5572fbbbb5ae 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -130,7 +130,6 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
130 if (cnt < msg->len-1 || !last) 130 if (cnt < msg->len-1 || !last)
131 ctrl |= I2C_NOSTOP | I2C_EXTEND; 131 ctrl |= I2C_NOSTOP | I2C_EXTEND;
132 132
133 //printk("addr = 0x%08x wdata = 0x%08x ctrl = 0x%08x\n", addr, wdata, ctrl);
134 cx_write(bus->reg_addr, addr); 133 cx_write(bus->reg_addr, addr);
135 cx_write(bus->reg_wdata, wdata); 134 cx_write(bus->reg_wdata, wdata);
136 cx_write(bus->reg_ctrl, ctrl); 135 cx_write(bus->reg_ctrl, ctrl);
@@ -297,7 +296,6 @@ static struct i2c_adapter cx23885_i2c_adap_template = {
297 .owner = THIS_MODULE, 296 .owner = THIS_MODULE,
298 .id = I2C_HW_B_CX23885, 297 .id = I2C_HW_B_CX23885,
299 .algo = &cx23885_i2c_algo_template, 298 .algo = &cx23885_i2c_algo_template,
300// .class = I2C_CLASS_TV_ANALOG,
301 .client_register = attach_inform, 299 .client_register = attach_inform,
302 .client_unregister = detach_inform, 300 .client_unregister = detach_inform,
303}; 301};
@@ -348,6 +346,7 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
348 346
349 strlcpy(bus->i2c_adap.name, bus->dev->name, 347 strlcpy(bus->i2c_adap.name, bus->dev->name,
350 sizeof(bus->i2c_adap.name)); 348 sizeof(bus->i2c_adap.name));
349
351 bus->i2c_algo.data = bus; 350 bus->i2c_algo.data = bus;
352 bus->i2c_adap.algo_data = bus; 351 bus->i2c_adap.algo_data = bus;
353 i2c_add_adapter(&bus->i2c_adap); 352 i2c_add_adapter(&bus->i2c_adap);