From 0c2d91f2a24afc26ead6d3e7515128009ce73441 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Mon, 22 Mar 2010 03:23:19 -0400
Subject: [PATCH] --- yaml --- r: 193171 b: refs/heads/master c:
 be2f80f0a3a333c0c00b2c8a7c2d74fcd66b75a2 h: refs/heads/master i:   193169:
 fcb8749e96bfea8695f642f9fa4234b67b4167bb   193167:
 0c727a1328176c1febfad6dafc16025c9ed0d7da v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/i2c/busses/i2c-bfin-twi.c | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index d0ec32e77c90..874cb69aab41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5481d0753e7a78bff7550a8165b7924baa74e9cf
+refs/heads/master: be2f80f0a3a333c0c00b2c8a7c2d74fcd66b75a2
diff --git a/trunk/drivers/i2c/busses/i2c-bfin-twi.c b/trunk/drivers/i2c/busses/i2c-bfin-twi.c
index ff61c4b22095..dabfa80cf5f2 100644
--- a/trunk/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/trunk/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;
 }
 
 /*