Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 239c795d authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: remove ath9k_hw_gettxintrtxqs 



The driver can just check the mask directly

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f3eef645

drivers/net/wireless/ath/ath9k/mac.c

+0 −7
Original line number Diff line number Diff line
@@ -185,13 +185,6 @@ bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q) 
}

EXPORT_SYMBOL(ath9k_hw_stop_dma_queue);



void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs)

{

	*txqs &= ah->intr_txqs;

	ah->intr_txqs &= ~(*txqs);

}

EXPORT_SYMBOL(ath9k_hw_gettxintrtxqs);



bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q,

			    const struct ath9k_tx_queue_info *qinfo)

{

drivers/net/wireless/ath/ath9k/mac.h

+0 −1
Original line number Diff line number Diff line
@@ -713,7 +713,6 @@ u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); 
bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel);

bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q);

void ath9k_hw_abort_tx_dma(struct ath_hw *ah);

void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs);

bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q,

			    const struct ath9k_tx_queue_info *qinfo);

bool ath9k_hw_get_txq_props(struct ath_hw *ah, int q,

drivers/net/wireless/ath/ath9k/xmit.c

+2 −3
Original line number Diff line number Diff line
@@ -2261,10 +2261,9 @@ static void ath_tx_complete_poll_work(struct work_struct *work) 


void ath_tx_tasklet(struct ath_softc *sc)

{

	struct ath_hw *ah = sc->sc_ah;

	u32 qcumask = ((1 << ATH9K_NUM_TX_QUEUES) - 1) & ah->intr_txqs;

	int i;

	u32 qcumask = ((1 << ATH9K_NUM_TX_QUEUES) - 1);



	ath9k_hw_gettxintrtxqs(sc->sc_ah, &qcumask);



	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {

		if (ATH_TXQ_SETUP(sc, i) && (qcumask & (1 << i)))