aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2017-03-25 09:09:03 -0400
committerWolfram Sang <wsa@the-dreams.de>2017-03-30 11:31:01 -0400
commite4d6bc380c9a3dd955a2c8c6c8856e913b1b42cb (patch)
tree45b544755e4655926e14ce370754348ed45ad4aa
parent47bb8f71caba9f3c424d35a2ac18428aaa85348a (diff)
i2c: meson: remove variable count from meson_i2c_xfer
Variable count has always the same value as i, so we don't need it. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r--drivers/i2c/busses/i2c-meson.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index abaa7cae0936..0a9847c37a63 100644
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -367,7 +367,7 @@ static int meson_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
367 int num) 367 int num)
368{ 368{
369 struct meson_i2c *i2c = adap->algo_data; 369 struct meson_i2c *i2c = adap->algo_data;
370 int i, ret = 0, count = 0; 370 int i, ret = 0;
371 371
372 clk_enable(i2c->clk); 372 clk_enable(i2c->clk);
373 373
@@ -375,12 +375,11 @@ static int meson_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
375 ret = meson_i2c_xfer_msg(i2c, msgs + i, i == num - 1); 375 ret = meson_i2c_xfer_msg(i2c, msgs + i, i == num - 1);
376 if (ret) 376 if (ret)
377 break; 377 break;
378 count++;
379 } 378 }
380 379
381 clk_disable(i2c->clk); 380 clk_disable(i2c->clk);
382 381
383 return ret ? ret : count; 382 return ret ?: i;
384} 383}
385 384
386static u32 meson_i2c_func(struct i2c_adapter *adap) 385static u32 meson_i2c_func(struct i2c_adapter *adap)