staging: brcm80211: removed references to 32 bit DMA registers

Code cleanup. Removed unused references.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/d11.h b/drivers/staging/brcm80211/brcmsmac/d11.h
index 50883af62496344a08635f158f3574e416e7c3ac..841e9402ed2b1e0ca1542654864e6e98823675ba 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/d11.h
+++ b/drivers/staging/brcm80211/brcmsmac/d11.h
@@ -76,12 +76,6 @@ typedef volatile union {
        pio4regp_t b4;          /* >= corerev 8 */
 } u_pioreg_t;
 
-/* dma/pio corerev < 11 */
-typedef volatile struct {
-       dma32regp_t dmaregs[8]; /* 0x200 - 0x2fc */
-       u_pioreg_t pioregs[8];  /* 0x300 */
-} fifo32_t;
-
 /* dma/pio corerev >= 11 */
 typedef volatile struct {
        dma64regs_t dmaxmt;     /* dma tx */
@@ -168,7 +162,6 @@ typedef volatile struct _d11regs {
 
        /* 0x200-0x37F dma/pio registers */
        volatile union {
-               fifo32_t f32regs;       /* tx fifos 6-7 and rx fifos 1-3 (corerev < 5) */
                fifo64_t f64regs[6];    /* on corerev >= 11 */
        } fifo;
 

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index 631ee733b9f537882315a23f289dd957bc776dd1..8d9aca5651f83b88e41b82351244f4ad44b6f80b 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -86,13 +86,10 @@
 
 #endif                         /* BMAC_DUP_TO_REMOVE */
 
-#define DMAREG(wlc_hw, direction, fifonum)     (D11REV_LT(wlc_hw->corerev, 11) ? \
-       ((direction == DMA_TX) ? \
-               (void *)&(wlc_hw->regs->fifo.f32regs.dmaregs[fifonum].xmt) : \
-               (void *)&(wlc_hw->regs->fifo.f32regs.dmaregs[fifonum].rcv)) : \
+#define DMAREG(wlc_hw, direction, fifonum) \
        ((direction == DMA_TX) ? \
                (void *)&(wlc_hw->regs->fifo.f64regs[fifonum].dmaxmt) : \
-               (void *)&(wlc_hw->regs->fifo.f64regs[fifonum].dmarcv)))
+               (void *)&(wlc_hw->regs->fifo.f64regs[fifonum].dmarcv))
 
 /*
  * The following table lists the buffer memory allocated to xmt fifos in HW.

diff --git a/drivers/staging/brcm80211/include/hnddma.h b/drivers/staging/brcm80211/include/hnddma.h
index 002c118fdc9ed4ea54b9671c970481a06e7d5724..17fa166f3968064a716e738c9debf44989a77d29 100644 (file)
--- a/drivers/staging/brcm80211/include/hnddma.h
+++ b/drivers/staging/brcm80211/include/hnddma.h
@@ -199,7 +199,4 @@ extern const di_fcn_t dma64proc;
  */
 extern uint dma_addrwidth(si_t *sih, void *dmaregs);
 
-/* pio helpers */
-extern void dma_txpioloopback(struct osl_info *osh, dma32regs_t *);
-
 #endif                         /* _hnddma_h_ */

diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index b5dd4cd229183f71da95af7fb981b04ee01d6a3b..2fc91662480740742b31356495f430b1508cd1ac 100644 (file)
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -56,11 +56,6 @@
 
 #define        DMA_NONE(args)
 
-#define d32txregs      dregs.d32_u.txregs_32
-#define d32rxregs      dregs.d32_u.rxregs_32
-#define txd32          dregs.d32_u.txd_32
-#define rxd32          dregs.d32_u.rxd_32
-
 #define d64txregs      dregs.d64_u.txregs_64
 #define d64rxregs      dregs.d64_u.rxregs_64
 #define txd64          dregs.d64_u.txd_64
@@ -89,12 +84,6 @@ typedef struct dma_info {
        bool addrext;           /* this dma engine supports DmaExtendedAddrChanges */
 
        union {
-               struct {
-                       dma32regs_t *txregs_32; /* 32-bit dma tx engine registers */
-                       dma32regs_t *rxregs_32; /* 32-bit dma rx engine registers */
-                       dma32dd_t *txd_32;      /* pointer to dma32 tx descriptor ring */
-                       dma32dd_t *rxd_32;      /* pointer to dma32 rx descriptor ring */
-               } d32_u;
                struct {
                        dma64regs_t *txregs_64; /* 64-bit dma tx engine registers */
                        dma64regs_t *rxregs_64; /* 64-bit dma rx engine registers */