From bc07f14675888f3655221f49036aee9f8c4e0f01 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Mon, 12 Dec 2011 15:15:04 -0800
Subject: [PATCH] --- yaml --- r: 278943 b: refs/heads/master c:
 646e2615d21d6438e033fd28888b8a6a62cda851 h: refs/heads/master i:   278941:
 ae14b49170728cec3f1d074881f15670c80a4c15   278939:
 e6f51e849bf9d616a1f1b56b7f4a80ffc7f19ca7   278935:
 b678cf169f4094da1359e11b4539c789dc248b4c   278927:
 9fef769cce978e7a7e3e9cd42a8549b4a7da113e   278911:
 84243d682dd8bad0daa7b0e99906655edca72e17 v: v3

---
 [refs]                                        |  2 +-
 .../net/wireless/brcm80211/brcmsmac/types.h   | 51 -------------------
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/[refs] b/[refs]
index 28d6e3ae53f6..2eacfa60592b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8086745215435281ca319b5243bf8b11a366ef3
+refs/heads/master: 646e2615d21d6438e033fd28888b8a6a62cda851
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/types.h b/trunk/drivers/net/wireless/brcm80211/brcmsmac/types.h
index e64971a759d3..e11ae83111e4 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/types.h
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/types.h
@@ -250,69 +250,18 @@ do {						\
 		wiphy_err(dev, "%s: " fmt, __func__, ##args);	\
 } while (0)
 
-/*
- * Register access macros.
- *
- * These macro's take a pointer to the address to read as one of their
- * arguments. The macro itself deduces the size of the IO transaction (u8, u16
- * or u32). Advantage of this approach in combination with using a struct to
- * define the registers in a register block, is that access size and access
- * location are defined in only one spot. This reduces the risk of the
- * programmer trying to use an unsupported transaction size on a register.
- *
- */
-
-#define R_REG(r) \
-	({ \
-		__typeof(*(r)) __osl_v; \
-		switch (sizeof(*(r))) { \
-		case sizeof(u8): \
-			__osl_v = readb((u8 __iomem *)(r)); \
-			break; \
-		case sizeof(u16): \
-			__osl_v = readw((u16 __iomem *)(r)); \
-			break; \
-		case sizeof(u32): \
-			__osl_v = readl((u32 __iomem *)(r)); \
-			break; \
-		} \
-		__osl_v; \
-	})
-
-#define W_REG(r, v) do { \
-		switch (sizeof(*(r))) { \
-		case sizeof(u8):	\
-			writeb((u8)((v) & 0xFF), (u8 __iomem *)(r)); \
-			break; \
-		case sizeof(u16):	\
-			writew((u16)((v) & 0xFFFF), (u16 __iomem *)(r)); \
-			break; \
-		case sizeof(u32):	\
-			writel((u32)(v), (u32 __iomem *)(r)); \
-			break; \
-		} \
-	} while (0)
-
 #ifdef CONFIG_BCM47XX
 /*
  * bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder
  * transactions. As a fix, a read after write is performed on certain places
  * in the code. Older chips and the newer 5357 family don't require this fix.
  */
-#define W_REG_FLUSH(r, v)	({ W_REG((r), (v)); (void)R_REG(r); })
 #define bcma_wflush16(c, o, v) \
 	({ bcma_write16(c, o, v); (void)bcma_read16(c, o); })
 #else
-#define W_REG_FLUSH(r, v)	W_REG((r), (v))
 #define bcma_wflush16(c, o, v)	bcma_write16(c, o, v)
 #endif				/* CONFIG_BCM47XX */
 
-#define AND_REG(r, v)	W_REG((r), R_REG(r) & (v))
-#define OR_REG(r, v)	W_REG((r), R_REG(r) | (v))
-
-#define SET_REG(r, mask, val) \
-		W_REG((r), ((R_REG(r) & ~(mask)) | (val)))
-
 /* multi-bool data type: set of bools, mbool is true if any is set */
 
 /* set one bool */