ath9k_hw: make ath9k_hw_set_interrupts use ah->imask by default

[pandora-kernel.git] / drivers / net / wireless / ath / ath9k / main.c

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 366912f..93fbe6f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -273,7 +273,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
 
        ath9k_cmn_update_txpow(ah, sc->curtxpow,
                               sc->config.txpowlimit, &sc->curtxpow);
-       ath9k_hw_set_interrupts(ah, ah->imask);
+       ath9k_hw_set_interrupts(ah);
        ath9k_hw_enable_interrupts(ah);
 
        if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) && start) {
@@ -833,7 +833,7 @@ irqreturn_t ath_isr(int irq, void *dev)
 
        if (status & ATH9K_INT_RXEOL) {
                ah->imask &= ~(ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
-               ath9k_hw_set_interrupts(ah, ah->imask);
+               ath9k_hw_set_interrupts(ah);
        }
 
        if (status & ATH9K_INT_MIB) {
@@ -1409,7 +1409,7 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
                ah->imask &= ~ATH9K_INT_TSFOOR;
        }
 
-       ath9k_hw_set_interrupts(ah, ah->imask);
+       ath9k_hw_set_interrupts(ah);
 
        /* Set up ANI */
        if (iter_data.naps > 0) {
@@ -1584,7 +1584,7 @@ static void ath9k_enable_ps(struct ath_softc *sc)
        if (!(ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {
                if ((ah->imask & ATH9K_INT_TIM_TIMER) == 0) {
                        ah->imask |= ATH9K_INT_TIM_TIMER;
-                       ath9k_hw_set_interrupts(ah, ah->imask);
+                       ath9k_hw_set_interrupts(ah);
                }
                ath9k_hw_setrxabort(ah, 1);
        }
@@ -1604,7 +1604,7 @@ static void ath9k_disable_ps(struct ath_softc *sc)
                                  PS_WAIT_FOR_TX_ACK);
                if (ah->imask & ATH9K_INT_TIM_TIMER) {
                        ah->imask &= ~ATH9K_INT_TIM_TIMER;
-                       ath9k_hw_set_interrupts(ah, ah->imask);
+                       ath9k_hw_set_interrupts(ah);
                }
        }