staging: brcm80211: removed several unused softmac main.h struct members

Members were always set to zero, or set but never read.

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

diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index 13f6cd4abac540b7632bb68c242417a877168a13..9df2f8609ee9ef891554b9de763170b1a50fd9e5 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -2384,9 +2384,7 @@ static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool on, u32 flags)
                                       null_ether_addr);
        } else {
                /* resume tx fifos */
-               if (!wlc_hw->wlc->tx_suspended)
-                       brcms_b_tx_fifo_resume(wlc_hw, TX_DATA_FIFO);
-
+               brcms_b_tx_fifo_resume(wlc_hw, TX_DATA_FIFO);
                brcms_b_tx_fifo_resume(wlc_hw, TX_CTL_FIFO);
                brcms_b_tx_fifo_resume(wlc_hw, TX_AC_BK_FIFO);
                brcms_b_tx_fifo_resume(wlc_hw, TX_AC_VI_FIFO);
@@ -2774,10 +2772,6 @@ void brcms_c_coredisable(struct brcms_hardware *wlc_hw)
        /* turn off PHYPLL to save power */
        brcms_b_core_phypll_ctl(wlc_hw, false);
 
-       /* remove gpio controls */
-       if (wlc_hw->ucode_dbgsel)
-               ai_gpiocontrol(wlc_hw->sih, ~0, 0, GPIO_DRV_PRIORITY);
-
        wlc_hw->clk = false;
        ai_core_disable(wlc_hw->sih, 0);
        wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
@@ -3601,9 +3595,6 @@ void brcms_c_init(struct brcms_c_info *wlc)
        /* clear tx flow control */
        brcms_c_txflowcontrol_reset(wlc);
 
-       /* clear tx data fifo suspends */
-       wlc->tx_suspended = false;
-
        /* enable the RF Disable Delay timer */
        W_REG(&wlc->regs->rfdisabledly, RFDISABLE_DEFAULT);
 
@@ -4380,8 +4371,6 @@ bool brcms_c_timers_init(struct brcms_c_info *wlc, int unit)
 void brcms_c_info_init(struct brcms_c_info *wlc, int unit)
 {
        int i;
-       /* Assume the device is there until proven otherwise */
-       wlc->device_present = true;
 
        /* Save our copy of the chanspec */
        wlc->chanspec = ch20mhz_chspec(1);

diff --git a/drivers/staging/brcm80211/brcmsmac/main.h b/drivers/staging/brcm80211/brcmsmac/main.h
index d418686fc7e6c6d6142b0f8c099f7652204f09fd..1ee283c5eb2307848a2bd8cd8bd659127a89b079 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.h
+++ b/drivers/staging/brcm80211/brcmsmac/main.h
@@ -382,7 +382,6 @@ struct brcms_hardware {
        u32 boardflags2;        /* More board flags if sromrev >= 4 */
        u32 machwcap;   /* MAC capabilities */
        u32 machwcap_backup;    /* backup of machwcap */
-       u16 ucode_dbgsel;       /* dbgsel for ucode debug(config gpio) */
 
        struct si_pub *sih;     /* SI handle (cookie for siutils calls) */
        char *vars;             /* "environment" name=value */
@@ -416,14 +415,11 @@ struct brcms_hardware {
        u32 wake_override;      /* bit flags to force MAC to WAKE mode */
        u32 mute_override;      /* Prevent ucode from sending beacons */
        u8 etheraddr[ETH_ALEN]; /* currently configured ethernet address */
-       u32 led_gpio_mask;      /* LED GPIO Mask */
        bool noreset;           /* true= do not reset hw, used by WLC_OUT */
        bool forcefastclk;      /* true if h/w is forcing to use fast clk */
        bool clk;               /* core is out of reset and has clock */
        bool sbclk;             /* sb has clock */
-       struct bmac_pmq *bmac_pmq; /*  bmac PM states derived from ucode PMQ */
        bool phyclk;            /* phy is out of reset and has clock */
-       bool dma_lpbk;          /* core is in DMA loopback */
 
        bool ucode_loaded;      /* true after ucode downloaded */
 
@@ -463,14 +459,12 @@ struct brcms_txq_info {
  * macintstatus: bit channel between isr and dpc.
  * macintmask: sw runtime master macintmask value.
  * defmacintmask: default "on" macintmask value.
- * device_present: (removable) device is present.
  * clk: core is out of reset and has clock.
  * core: pointer to active io core.
  * band: pointer to active per-band state.
  * corestate: per-core state (one per hw core).
  * bandstate: per-band state (one per phy/radio).
  * war16165: PCI slow clock 16165 war flag.
- * tx_suspended: data fifos need to remain suspended.
  * txpend16165war: PCI slow clock 16165 war flag.
  * qvalid: DirFrmQValid and BcMcFrmQValid.
  * txpwr_local_max: regulatory local txpwr max.
@@ -559,7 +553,6 @@ struct brcms_c_info {
        struct brcms_hardware *hw;
 
        /* clock */
-       int clkreq_override;
        u16 fastpwrup_dly;
 
        /* interrupt */
@@ -567,9 +560,6 @@ struct brcms_c_info {
        u32 macintmask;
        u32 defmacintmask;
 
-       /* up and down */
-       bool device_present;
-
        bool clk;
 
        /* multiband */
@@ -579,9 +569,6 @@ struct brcms_c_info {
        struct brcms_band *bandstate[MAXBANDS];
 
        bool war16165;
-
-       bool tx_suspended;
-
        uint txpend16165war;
 
        /* packet queue */