summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonic Zhang <sonic.zhang@analog.com>2010-03-22 03:23:19 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-20 00:18:58 +0100
commitbe2f80f0a3a333c0c00b2c8a7c2d74fcd66b75a2 (patch)
tree22d88c7054590be32be77ca246f8aa8eef529f5f
parent5481d0753e7a78bff7550a8165b7924baa74e9cf (diff)
i2c-bfin-twi: remove redundant retry
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--drivers/i2c/busses/i2c-bfin-twi.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index ff61c4b22095..dabfa80cf5f2 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -358,15 +358,7 @@ static int bfin_twi_do_master_xfer(struct i2c_adapter *adap,
static int bfin_twi_master_xfer(struct i2c_adapter *adap,
struct i2c_msg *msgs, int num)
{
- int i, ret = 0;
-
- for (i = 0; i < adap->retries; i++) {
- ret = bfin_twi_do_master_xfer(adap, msgs, num);
- if (ret > 0)
- break;
- }
-
- return ret;
+ return bfin_twi_do_master_xfer(adap, msgs, num);
}
/*
@@ -574,16 +566,8 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,
unsigned short flags, char read_write,
u8 command, int size, union i2c_smbus_data *data)
{
- int i, ret = 0;
-
- for (i = 0; i < adap->retries; i++) {
- ret = bfin_twi_do_smbus_xfer(adap, addr, flags,
+ return bfin_twi_do_smbus_xfer(adap, addr, flags,
read_write, command, size, data);
- if (ret == 0)
- break;
- }
-
- return ret;
}
/*