revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / video / via / via_i2c.c

diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
index 021112e279dea051ed07a5537f79d89142c5a4dd..da9e4ca94b1748ce426584c404f70d70808a7902 100644 (file)
--- a/drivers/video/via/via_i2c.c
+++ b/drivers/video/via/via_i2c.c
@@ -114,7 +114,6 @@ static void via_i2c_setsda(void *data, int state)
 
 int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata)
 {
-       int ret;
        u8 mm1[] = {0x00};
        struct i2c_msg msgs[2];
 
@@ -127,18 +126,11 @@ int viafb_i2c_readbyte(u8 adap, u8 slave_addr, u8 index, u8 *pdata)
        mm1[0] = index;
        msgs[0].len = 1; msgs[1].len = 1;
        msgs[0].buf = mm1; msgs[1].buf = pdata;
-       ret = i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
-       if (ret == 2)
-               ret = 0;
-       else if (ret >= 0)
-               ret = -EIO;
-
-       return ret;
+       return i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
 }
 
 int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data)
 {
-       int ret;
        u8 msg[2] = { index, data };
        struct i2c_msg msgs;
 
@@ -148,18 +140,11 @@ int viafb_i2c_writebyte(u8 adap, u8 slave_addr, u8 index, u8 data)
        msgs.addr = slave_addr / 2;
        msgs.len = 2;
        msgs.buf = msg;
-       ret = i2c_transfer(&via_i2c_par[adap].adapter, &msgs, 1);
-       if (ret == 1)
-               ret = 0;
-       else if (ret >= 0)
-               ret = -EIO;
-
-       return ret;
+       return i2c_transfer(&via_i2c_par[adap].adapter, &msgs, 1);
 }
 
 int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len)
 {
-       int ret;
        u8 mm1[] = {0x00};
        struct i2c_msg msgs[2];
 
@@ -171,13 +156,7 @@ int viafb_i2c_readbytes(u8 adap, u8 slave_addr, u8 index, u8 *buff, int buff_len
        mm1[0] = index;
        msgs[0].len = 1; msgs[1].len = buff_len;
        msgs[0].buf = mm1; msgs[1].buf = buff;
-       ret = i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
-       if (ret == 2)
-               ret = 0;
-       else if (ret >= 0)
-               ret = -EIO;
-
-       return ret;
+       return i2c_transfer(&via_i2c_par[adap].adapter, msgs, 2);
 }
 
 /*