i2c: exynos5: simplify transfer function

exynos5_i2c_xfer contains lots of dead code, let's remove it and simplify
the rest. The patch should not introduce functional changes.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Suggested-by: Peter Rosin <peda@axentia.se>
Reviewed-by: Andi Shyti <andi@etezian.org>
Reviewed-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index 12ec8484e65375cd24cc7b18fcd2fe5a7a458374..de82ad8ff5347cdb7a8ddfc6005619633164ef40 100644 (file)
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -707,7 +707,7 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap,
                        struct i2c_msg *msgs, int num)
 {
        struct exynos5_i2c *i2c = adap->algo_data;
-       int i = 0, ret = 0, stop = 0;
+       int i, ret;
 
        if (i2c->suspended) {
                dev_err(i2c->dev, "HS-I2C is not initialized.\n");
@@ -718,30 +718,15 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap,
        if (ret)
                return ret;
 
-       for (i = 0; i < num; i++, msgs++) {
-               stop = (i == num - 1);
-
-               ret = exynos5_i2c_xfer_msg(i2c, msgs, stop);
-
-               if (ret < 0)
-                       goto out;
-       }
-
-       if (i == num) {
-               ret = num;
-       } else {
-               /* Only one message, cannot access the device */
-               if (i == 1)
-                       ret = -EREMOTEIO;
-               else
-                       ret = i;
-
-               dev_warn(i2c->dev, "xfer message failed\n");
+       for (i = 0; i < num; ++i) {
+               ret = exynos5_i2c_xfer_msg(i2c, msgs + i, i + 1 == num);
+               if (ret)
+                       break;
        }
 
- out:
        clk_disable(i2c->clk);
-       return ret;
+
+       return ret ?: num;
 }
 
 static u32 exynos5_i2c_func(struct i2c_adapter *adap)