From 18956104348b112ff1222722ef5a18d6d75d6744 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 12 Oct 2010 13:04:58 -0700
Subject: [PATCH] --- yaml --- r: 220308 b: refs/heads/master c:
 ec1284e104f9a598474cb7979c01633b5d1d550b h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/include/bcmsdpcm.h      | 48 -------------------
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/[refs] b/[refs]
index 4cf31030da6b..5dae7fd476e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0965ae88aff802ff48fa2f35fff29feff2754962
+refs/heads/master: ec1284e104f9a598474cb7979c01633b5d1d550b
diff --git a/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h b/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h
index ab5945a68b98..48699471fac8 100644
--- a/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h
+++ b/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h
@@ -182,54 +182,6 @@ typedef volatile struct {
 	u32 wftermint;	/* write frame terminate interrupt */
 } sdpcmd_cnt_t;
 
-/*
- * Register Access Macros
- */
-
-#define SDIODREV_IS(var, val)	((var) == (val))
-#define SDIODREV_GE(var, val)	((var) >= (val))
-#define SDIODREV_GT(var, val)	((var) > (val))
-#define SDIODREV_LT(var, val)	((var) < (val))
-#define SDIODREV_LE(var, val)	((var) <= (val))
-
-#define SDIODDMAREG32(h, dir, chnl) \
-	((dir) == DMA_TX ? \
-	 (void *)(uintptr)&((h)->regs->dma.sdiod32.dma32regs[chnl].xmt) : \
-	 (void *)(uintptr)&((h)->regs->dma.sdiod32.dma32regs[chnl].rcv))
-
-#define SDIODDMAREG64(h, dir, chnl) \
-	((dir) == DMA_TX ? \
-	 (void *)(uintptr)&((h)->regs->dma.sdiod64.dma64regs[chnl].xmt) : \
-	 (void *)(uintptr)&((h)->regs->dma.sdiod64.dma64regs[chnl].rcv))
-
-#define SDIODDMAREG(h, dir, chnl) \
-	(SDIODREV_LT((h)->corerev, 1) ? \
-	 SDIODDMAREG32((h), (dir), (chnl)) : \
-	 SDIODDMAREG64((h), (dir), (chnl)))
-
-#define PCMDDMAREG(h, dir, chnl) \
-	((dir) == DMA_TX ? \
-	 (void *)(uintptr)&((h)->regs->dma.pcm32.dmaregs.xmt) : \
-	 (void *)(uintptr)&((h)->regs->dma.pcm32.dmaregs.rcv))
-
-#define SDPCMDMAREG(h, dir, chnl, coreid) \
-	((coreid) == SDIOD_CORE_ID ? \
-	 SDIODDMAREG(h, dir, chnl) : \
-	 PCMDDMAREG(h, dir, chnl))
-
-#define SDIODFIFOREG(h, corerev) \
-	(SDIODREV_LT((corerev), 1) ? \
-	 ((dma32diag_t *)(uintptr)&((h)->regs->dma.sdiod32.dmafifo)) : \
-	 ((dma32diag_t *)(uintptr)&((h)->regs->dma.sdiod64.dmafifo)))
-
-#define PCMDFIFOREG(h) \
-	((dma32diag_t *)(uintptr)&((h)->regs->dma.pcm32.dmafifo))
-
-#define SDPCMFIFOREG(h, coreid, corerev) \
-	((coreid) == SDIOD_CORE_ID ? \
-	 SDIODFIFOREG(h, corerev) : \
-	 PCMDFIFOREG(h))
-
 /*
  * Shared structure between dongle and the host.
  * The structure contains pointers to trap or assert information.