From: Sujith <Sujith.Manoharan@atheros.com>
Date: Fri, 16 Jan 2009 16:08:45 +0000 (+0530)
Subject: ath9k: Remove ath_tx_stopdma and call ath9k_hw_stoptxdma directly
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=55f5e4a9800ae6e6e052380a8b3c9c4996d5cd05;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ath9k: Remove ath_tx_stopdma and call ath9k_hw_stoptxdma directly

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 5e6e5cf9b67f..c9ead1ba88da 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -877,12 +877,6 @@ static u32 ath_txq_depth(struct ath_softc *sc, int qnum)
 	return sc->tx.txq[qnum].axq_depth;
 }
 
-static void ath_tx_stopdma(struct ath_softc *sc, struct ath_txq *txq)
-{
-	struct ath_hal *ah = sc->sc_ah;
-	(void) ath9k_hw_stoptxdma(ah, txq->axq_qnum);
-}
-
 static void ath_get_beaconconfig(struct ath_softc *sc, int if_id,
 				 struct ath_beacon_config *conf)
 {
@@ -899,15 +893,17 @@ static void ath_get_beaconconfig(struct ath_softc *sc, int if_id,
 static void ath_drain_txdataq(struct ath_softc *sc, bool retry_tx)
 {
 	struct ath_hal *ah = sc->sc_ah;
+	struct ath_txq *txq;
 	int i, npend = 0;
 
-	if (!(sc->sc_flags & SC_OP_INVALID)) {
-		for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-			if (ATH_TXQ_SETUP(sc, i)) {
-				ath_tx_stopdma(sc, &sc->tx.txq[i]);
-				npend += ath9k_hw_numtxpending(ah,
-						       sc->tx.txq[i].axq_qnum);
-			}
+	if (sc->sc_flags & SC_OP_INVALID)
+		return;
+
+	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+		if (ATH_TXQ_SETUP(sc, i)) {
+			txq = &sc->tx.txq[i];
+			ath9k_hw_stoptxdma(ah, txq->axq_qnum);
+			npend += ath9k_hw_numtxpending(ah, txq->axq_qnum);
 		}
 	}