From 548745c6e70caa875dd83381a04c29485d7de4c2 Mon Sep 17 00:00:00 2001
From: Sebastian Siewior <bigeasy@linutronix.de>
Date: Wed, 24 Apr 2013 08:48:24 +0000
Subject: [PATCH] --- yaml --- r: 369759 b: refs/heads/master c:
 6e6ceaedb5901c7ebd23e5222726dab5362938bd h: refs/heads/master i:   369757:
 417de3d2b2d89585204867c967ca11b8baa2a7b6   369755:
 fd53f2b6a10012fd6fe7bb481026ea1284e2ea7f   369751:
 6bd8d583bd8492bafed4762cdb2109bf03e37960   369743:
 4e8320e6b3a5b7f4cd0beb336bebd8b0a91e8fdd   369727:
 07a16dc3dd51b0c98763b19e98d973c059a0113e v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ethernet/ti/cpsw.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 94ec735abb92..9d95c97e4476 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1bd9acfa3419dc9d5c32589b34a370ca6ae100e
+refs/heads/master: 6e6ceaedb5901c7ebd23e5222726dab5362938bd
diff --git a/trunk/drivers/net/ethernet/ti/cpsw.c b/trunk/drivers/net/ethernet/ti/cpsw.c
index 93a60e238146..1c1e7a82f909 100644
--- a/trunk/drivers/net/ethernet/ti/cpsw.c
+++ b/trunk/drivers/net/ethernet/ti/cpsw.c
@@ -355,12 +355,15 @@ struct cpsw_priv {
 #define napi_to_priv(napi)	container_of(napi, struct cpsw_priv, napi)
 #define for_each_slave(priv, func, arg...)				\
 	do {								\
-		int idx;						\
+		struct cpsw_slave *slave;				\
+		int n;							\
 		if (priv->data.dual_emac)				\
 			(func)((priv)->slaves + priv->emac_port, ##arg);\
 		else							\
-			for (idx = 0; idx < (priv)->data.slaves; idx++)	\
-				(func)((priv)->slaves + idx, ##arg);	\
+			for (n = (priv)->data.slaves,			\
+					slave = (priv)->slaves;		\
+					n; n--)				\
+				(func)(slave++, ##arg);			\
 	} while (0)
 #define cpsw_get_slave_ndev(priv, __slave_no__)				\
 	(priv->slaves[__slave_no__].ndev)