diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-14 11:40:26 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-15 13:45:04 -0400 |
commit | 239c795d6ba9ada0811cdb4f87304552de29e81b (patch) | |
tree | b5d4e90db0ac16bf44d63553ad1d834eb80c35d1 /drivers/net | |
parent | f3eef64521f82330b4b173584d776b8a04b3e795 (diff) |
ath9k_hw: remove ath9k_hw_gettxintrtxqs
The driver can just check the mask directly
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 5 |
3 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index bfb95e5d263..f7bd2532269 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c | |||
@@ -185,13 +185,6 @@ bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q) | |||
185 | } | 185 | } |
186 | EXPORT_SYMBOL(ath9k_hw_stop_dma_queue); | 186 | EXPORT_SYMBOL(ath9k_hw_stop_dma_queue); |
187 | 187 | ||
188 | void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs) | ||
189 | { | ||
190 | *txqs &= ah->intr_txqs; | ||
191 | ah->intr_txqs &= ~(*txqs); | ||
192 | } | ||
193 | EXPORT_SYMBOL(ath9k_hw_gettxintrtxqs); | ||
194 | |||
195 | bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, | 188 | bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, |
196 | const struct ath9k_tx_queue_info *qinfo) | 189 | const struct ath9k_tx_queue_info *qinfo) |
197 | { | 190 | { |
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index 6476d907320..21c955609e6 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h | |||
@@ -713,7 +713,6 @@ u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); | |||
713 | bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); | 713 | bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); |
714 | bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q); | 714 | bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q); |
715 | void ath9k_hw_abort_tx_dma(struct ath_hw *ah); | 715 | void ath9k_hw_abort_tx_dma(struct ath_hw *ah); |
716 | void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); | ||
717 | bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, | 716 | bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, |
718 | const struct ath9k_tx_queue_info *qinfo); | 717 | const struct ath9k_tx_queue_info *qinfo); |
719 | bool ath9k_hw_get_txq_props(struct ath_hw *ah, int q, | 718 | bool ath9k_hw_get_txq_props(struct ath_hw *ah, int q, |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index c6b93f61984..834e6bc45e8 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -2261,10 +2261,9 @@ static void ath_tx_complete_poll_work(struct work_struct *work) | |||
2261 | 2261 | ||
2262 | void ath_tx_tasklet(struct ath_softc *sc) | 2262 | void ath_tx_tasklet(struct ath_softc *sc) |
2263 | { | 2263 | { |
2264 | struct ath_hw *ah = sc->sc_ah; | ||
2265 | u32 qcumask = ((1 << ATH9K_NUM_TX_QUEUES) - 1) & ah->intr_txqs; | ||
2264 | int i; | 2266 | int i; |
2265 | u32 qcumask = ((1 << ATH9K_NUM_TX_QUEUES) - 1); | ||
2266 | |||
2267 | ath9k_hw_gettxintrtxqs(sc->sc_ah, &qcumask); | ||
2268 | 2267 | ||
2269 | for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { | 2268 | for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { |
2270 | if (ATH_TXQ_SETUP(sc, i) && (qcumask & (1 << i))) | 2269 | if (ATH_TXQ_SETUP(sc, i) && (qcumask & (1 << i))) |