i2c: tegra-bpmp: don't modify input variable in xlate_flags

[sfrench/cifs-2.6.git] / drivers / i2c / busses / i2c-tegra-bpmp.c

diff --git a/drivers/i2c/busses/i2c-tegra-bpmp.c b/drivers/i2c/busses/i2c-tegra-bpmp.c
index c0c7d01473f2ba110553c0349e10ca6b03dbb7ca..295286ad6d6c4c9c763ef27802af4c4132726f4a 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra-bpmp.c
+++ b/drivers/i2c/busses/i2c-tegra-bpmp.c
@@ -40,45 +40,29 @@ struct tegra_bpmp_i2c {
  */
 static int tegra_bpmp_xlate_flags(u16 flags, u16 *out)
 {
-       if (flags & I2C_M_TEN) {
+       if (flags & I2C_M_TEN)
                *out |= SERIALI2C_TEN;
-               flags &= ~I2C_M_TEN;
-       }
 
-       if (flags & I2C_M_RD) {
+       if (flags & I2C_M_RD)
                *out |= SERIALI2C_RD;
-               flags &= ~I2C_M_RD;
-       }
 
-       if (flags & I2C_M_STOP) {
+       if (flags & I2C_M_STOP)
                *out |= SERIALI2C_STOP;
-               flags &= ~I2C_M_STOP;
-       }
 
-       if (flags & I2C_M_NOSTART) {
+       if (flags & I2C_M_NOSTART)
                *out |= SERIALI2C_NOSTART;
-               flags &= ~I2C_M_NOSTART;
-       }
 
-       if (flags & I2C_M_REV_DIR_ADDR) {
+       if (flags & I2C_M_REV_DIR_ADDR)
                *out |= SERIALI2C_REV_DIR_ADDR;
-               flags &= ~I2C_M_REV_DIR_ADDR;
-       }
 
-       if (flags & I2C_M_IGNORE_NAK) {
+       if (flags & I2C_M_IGNORE_NAK)
                *out |= SERIALI2C_IGNORE_NAK;
-               flags &= ~I2C_M_IGNORE_NAK;
-       }
 
-       if (flags & I2C_M_NO_RD_ACK) {
+       if (flags & I2C_M_NO_RD_ACK)
                *out |= SERIALI2C_NO_RD_ACK;
-               flags &= ~I2C_M_NO_RD_ACK;
-       }
 
-       if (flags & I2C_M_RECV_LEN) {
+       if (flags & I2C_M_RECV_LEN)
                *out |= SERIALI2C_RECV_LEN;
-               flags &= ~I2C_M_RECV_LEN;
-       }
 
        return 0;
 }
@@ -217,7 +201,32 @@ static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c,
        else
                err = tegra_bpmp_transfer(i2c->bpmp, &msg);
 
-       return err;
+       if (err < 0) {
+               dev_err(i2c->dev, "failed to transfer message: %d\n", err);
+               return err;
+       }
+
+       if (msg.rx.ret != 0) {
+               if (msg.rx.ret == -BPMP_EAGAIN) {
+                       dev_dbg(i2c->dev, "arbitration lost\n");
+                       return -EAGAIN;
+               }
+
+               if (msg.rx.ret == -BPMP_ETIMEDOUT) {
+                       dev_dbg(i2c->dev, "timeout\n");
+                       return -ETIMEDOUT;
+               }
+
+               if (msg.rx.ret == -BPMP_ENXIO) {
+                       dev_dbg(i2c->dev, "NAK\n");
+                       return -ENXIO;
+               }
+
+               dev_err(i2c->dev, "transaction failed: %d\n", msg.rx.ret);
+               return -EIO;
+       }
+
+       return 0;
 }
 
 static int tegra_bpmp_i2c_xfer_common(struct i2c_adapter *adapter,