From c1bb9da89c647b43c3ff1105c850721045abebd7 Mon Sep 17 00:00:00 2001
From: Henry Ptasinski <henryp@broadcom.com>
Date: Mon, 15 Aug 2011 15:34:22 +0200
Subject: [PATCH] --- yaml --- r: 267493 b: refs/heads/master c:
 ba1fff7f705ed15e9d5a5922614aa4a259e9f8bc h: refs/heads/master i:   267491:
 7eef1ee8e247202d33850418d6e6af02ae0b10b6 v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/brcmsmac/types.h        | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 3136c8f12a69..8c5f70fea138 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ac98a56fac0cafb56d900154ac4569a959011c0
+refs/heads/master: ba1fff7f705ed15e9d5a5922614aa4a259e9f8bc
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/types.h b/trunk/drivers/staging/brcm80211/brcmsmac/types.h
index c0d41cc910d3..ad874a79cb4c 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/types.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/types.h
@@ -329,28 +329,17 @@ do {						\
  * location are defined in only one spot. This reduces the risk of the
  * programmer trying to use an unsupported transaction size on a register.
  *
- * For big endian operation, a byte swap has to be done. Eg, when attempting
- * to read byte address 0, byte 3 should be read. This is accomplished
- * using an xor ('^') operator.
  */
 
-#ifndef __BIG_ENDIAN
-#define SWP2(r)	(r)
-#define SWP3(r) (r)
-#else
-#define SWP2(r)	((unsigned long)(r)^2)
-#define SWP3(r)	((unsigned long)(r)^3)
-#endif /* __BIG_ENDIAN */
-
 #define R_REG(r) \
 	({ \
 		__typeof(*(r)) __osl_v; \
 		switch (sizeof(*(r))) { \
 		case sizeof(u8): \
-			__osl_v = readb((u8 *)(SWP3(r))); \
+			__osl_v = readb((u8 *)(r)); \
 			break; \
 		case sizeof(u16): \
-			__osl_v = readw((u16 *)(SWP2(r))); \
+			__osl_v = readw((u16 *)(r)); \
 			break; \
 		case sizeof(u32): \
 			__osl_v = readl((u32 *)(r)); \
@@ -362,10 +351,10 @@ do {						\
 #define W_REG(r, v) do { \
 		switch (sizeof(*(r))) { \
 		case sizeof(u8):	\
-			writeb((u8)(v), (u8 *)(SWP3(r))); \
+			writeb((u8)(v), (u8 *)(r)); \
 			break; \
 		case sizeof(u16):	\
-			writew((u16)(v), (u16 *)(SWP2(r))); \
+			writew((u16)(v), (u16 *)(r)); \
 			break; \
 		case sizeof(u32):	\
 			writel((u32)(v), (u32 *)(r)); \