lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB: cx23885: i2c_wait_done returns 0 or 1, don't check for < 0 return value

Browse Source 
Function i2c_wait_done() never returns negative values, so there is no
point in checking for them.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean Delvare
2010-07-18 17:05:17 -03:00
committed by Mauro Carvalho Chehab
parent 44835f197b
commit 18a87becf8
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/video/cx23885/cx23885-i2c.c
View File

@@ -120,10 +120,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
cx_write(bus->reg_wdata, wdata); cx_write(bus->reg_wdata, wdata);
cx_write(bus->reg_ctrl, ctrl); cx_write(bus->reg_ctrl, ctrl);
retval = i2c_wait_done(i2c_adap); if (!i2c_wait_done(i2c_adap))
if (retval < 0)
goto err;
if (retval == 0)
goto eio; goto eio;
if (!i2c_slave_did_ack(i2c_adap)) { if (!i2c_slave_did_ack(i2c_adap)) {
retval = -ENXIO; retval = -ENXIO;
@@ -149,10 +146,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
cx_write(bus->reg_wdata, wdata); cx_write(bus->reg_wdata, wdata);
cx_write(bus->reg_ctrl, ctrl); cx_write(bus->reg_ctrl, ctrl);
retval = i2c_wait_done(i2c_adap); if (!i2c_wait_done(i2c_adap))
if (retval < 0)
goto err;
if (retval == 0)
goto eio; goto eio;
if (i2c_debug) { if (i2c_debug) {
dprintk(1, " %02x", msg->buf[cnt]); dprintk(1, " %02x", msg->buf[cnt]);
@@ -213,10 +207,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
cx_write(bus->reg_addr, msg->addr << 25); cx_write(bus->reg_addr, msg->addr << 25);
cx_write(bus->reg_ctrl, ctrl); cx_write(bus->reg_ctrl, ctrl);
retval = i2c_wait_done(i2c_adap); if (!i2c_wait_done(i2c_adap))
if (retval < 0)
goto err;
if (retval == 0)
goto eio; goto eio;
if (cnt == 0 && !i2c_slave_did_ack(i2c_adap)) { if (cnt == 0 && !i2c_slave_did_ack(i2c_adap)) {
retval = -ENXIO; retval = -ENXIO;