staging: brcm80211: code cleanup

Removed inactive code sections (BCM_DMAPAD and CHIPC_UART_ALWAYS_ON
were never defined). Also replaced magic number by #define. Deleted
incorrect comment.

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

diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 774b4e916b29a34d24290dbaf35165a8746bdc83..182a9f5284ebdaaa9f6f238a1ddbbc5e12634b11 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -48,6 +48,8 @@
 #include "wl_ucode.h"
 #include "wl_mac80211.h"
 
+#define N_TX_QUEUES    4 /* #tx queues on mac80211<->driver interface */
+
 static void wl_timer(unsigned long data);
 static void _wl_timer(struct wl_timer *t);
 
@@ -1070,8 +1072,7 @@ static int ieee_hw_init(struct ieee80211_hw *hw)
            | IEEE80211_HW_AMPDU_AGGREGATION;
 
        hw->extra_tx_headroom = wlc_get_header_len();
-       /* FIXME: should get this from wlc->machwcap */
-       hw->queues = 4;
+       hw->queues = N_TX_QUEUES;
        /* FIXME: this doesn't seem to be used properly in minstrel_ht.
         * mac80211/status.c:ieee80211_tx_status() checks this value,
         * but mac80211/rc80211_minstrel_ht.c:minstrel_ht_get_rate()

diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 8a81eb997f995b64abdc8725e97f4b6ed4001757..0e25d18f64379ca41e67eae8fe3cbb2a0a9b898e 100644 (file)
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -1451,9 +1451,6 @@ static int BCMFASTPATH dma64_txfast(dma_info_t *di, struct sk_buff *p0,
 
                data = p->data;
                len = p->len;
-#ifdef BCM_DMAPAD
-               len += PKTDMAPAD(di->osh, p);
-#endif                         /* BCM_DMAPAD */
                next = p->next;
 
                /* return nonzero if out of tx descriptors */

diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c
index 59e3ede89fe78d74daccb0d498b6bf444ce6c995..3675d1b1aa813dd0a277ba51ac7b15743cf6f520 100644 (file)
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/drivers/staging/brcm80211/util/hndpmu.c
@@ -34,7 +34,6 @@
 
 /* debug-only definitions */
 /* #define BCMDBG_FORCEHT */
-/* #define CHIPC_UART_ALWAYS_ON */
 #else
 #define        PMU_MSG(args)
 #endif                         /* BCMDBG */
@@ -2511,11 +2510,6 @@ void si_pmu_chip_init(si_t *sih)
 
        ASSERT(sih->cccaps & CC_CAP_PMU);
 
-#ifdef CHIPC_UART_ALWAYS_ON
-       si_corereg(sih, SI_CC_IDX, offsetof(chipcregs_t, clk_ctl_st),
-                  CCS_FORCEALP, CCS_FORCEALP);
-#endif                         /* CHIPC_UART_ALWAYS_ON */
-
        /* Gate off SPROM clock and chip select signals */
        si_pmu_sprom_enable(sih, false);