staging: brcm80211: removed unneeded call to brcms_b_tx_fifo_suspended

- removed call to brcms_b_tx_fifo_suspended on receipt of TX FIFO suspend/flush
  completion signal.
- removed brcms_b_tx_fifo_suspended function as it is not being used elsewhere.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-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 bd38f33b13eead995888e4c8952d763eafada3d6..175d85ea429136ae673ee130dfb4599e666ae060 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -1075,36 +1075,6 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
        return morepending;
 }
 
-/* brcms_b_tx_fifo_suspended:
- * Check the MAC's tx suspend status for a tx fifo.
- *
- * When the MAC acknowledges a tx suspend, it indicates that no more
- * packets will be transmitted out the radio. This is independent of
- * DMA channel suspension---the DMA may have finished suspending, or may still
- * be pulling data into a tx fifo, by the time the MAC acks the suspend
- * request.
- */
-static bool brcms_b_tx_fifo_suspended(struct brcms_hardware *wlc_hw,
-                                     uint tx_fifo)
-{
-       /* check that a suspend has been requested and is no longer pending */
-
-       /*
-        * for DMA mode, the suspend request is set in xmtcontrol of the DMA
-        * engine, and the tx fifo suspend at the lower end of the MAC is
-        * acknowledged in the chnstatus register.
-        *
-        * The tx fifo suspend completion is independent of the DMA suspend
-        * completion and may be acked before or after the DMA is suspended.
-        */
-       if (dma_txsuspended(wlc_hw->di[tx_fifo]) &&
-           (R_REG(&wlc_hw->regs->chnstatus) &
-            (1 << tx_fifo)) == 0)
-               return true;
-
-       return false;
-}
-
 /* second-level interrupt processing
  *   Return true if another dpc needs to be re-scheduled. false otherwise.
  *   Param 'bounded' indicates if applicable loops should be bounded.
@@ -1161,10 +1131,6 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
                if (brcms_b_recv(wlc_hw, RX_FIFO, bounded))
                        wlc->macintstatus |= MI_DMAINT;
 
-       /* TX FIFO suspend/flush completion */
-       if (macintstatus & MI_TXSTOP)
-               brcms_b_tx_fifo_suspended(wlc_hw, TX_DATA_FIFO);
-
        /* noise sample collected */
        if (macintstatus & MI_BG_NOISE)
                wlc_phy_noise_sample_intr(wlc_hw->band->pi);