diff options
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-i2c.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-i2c.c b/linux/drivers/media/video/cx23885/cx23885-i2c.c index c3551b17f..22594396b 100644 --- a/linux/drivers/media/video/cx23885/cx23885-i2c.c +++ b/linux/drivers/media/video/cx23885/cx23885-i2c.c @@ -86,11 +86,6 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, int retval, cnt; dprintk(1, "%s()\n", __FUNCTION__); -#if 0 - /* sanity checks */ - if (0 == msg->len) - return -EINVAL; -#endif /* Deal with i2c probe functions with zero payload */ if (msg->len == 0) { cx_write(bus->reg_addr, msg->addr << 25); @@ -136,7 +131,6 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, if (cnt < msg->len-1 || !last) ctrl |= I2C_NOSTOP | I2C_EXTEND; - //printk("addr = 0x%08x wdata = 0x%08x ctrl = 0x%08x\n", addr, wdata, ctrl); cx_write(bus->reg_addr, addr); cx_write(bus->reg_wdata, wdata); cx_write(bus->reg_ctrl, ctrl); @@ -305,7 +299,6 @@ static struct i2c_adapter cx23885_i2c_adap_template = { #endif .id = I2C_HW_B_CX23885, .algo = &cx23885_i2c_algo_template, -// .class = I2C_CLASS_TV_ANALOG, .client_register = attach_inform, .client_unregister = detach_inform, }; @@ -356,13 +349,9 @@ int cx23885_i2c_register(struct cx23885_i2c *bus) strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name)); -#if 0 - bus->i2c_algo.data = dev; - bus->i2c_adap.algo_data = dev; -#else + bus->i2c_algo.data = bus; bus->i2c_adap.algo_data = bus; -#endif i2c_add_adapter(&bus->i2c_adap); bus->i2c_client.adapter = &bus->i2c_adap; |