iwlwifi: stop_hw replace enable_rfkill_int

This trans_ops->stop_hw leaves the RFKILL interrupt enabled,
we can call that one instead of enable_rfkill_int. By that,
we reduce the numbers of acceesses to the NIC from the upper
layers.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index e74bfb7bbb27663b6d2f7e2ec212efaaa723b3d5..8d60dcf6f2eb87b10da6e33446c440b5a6609ead 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -297,12 +297,6 @@ static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)
               cfg(priv)->bt_params->advanced_bt_coexist;
 }
 
-static inline void iwl_enable_rfkill_int(struct iwl_priv *priv)
-{
-       IWL_DEBUG_ISR(priv, "Enabling rfkill interrupt\n");
-       iwl_write32(trans(priv), CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
-}
-
 extern bool bt_siso_mode;
 
 #endif /* __iwl_core_h__ */

diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 78bc1e857b00089435198ac01d44045899473397..7177fd76e28af51a6f2c5e6f4d76e90c19e711a8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -346,9 +346,10 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)
        flush_workqueue(priv->shrd->workqueue);
 
        /* User space software may expect getting rfkill changes
-        * even if interface is down */
-       iwl_write32(trans(priv), CSR_INT, 0xFFFFFFFF);
-       iwl_enable_rfkill_int(priv);
+        * even if interface is down, trans->down will leave the RF
+        * kill interrupt enabled
+        */
+       iwl_trans_stop_hw(trans(priv));
 
        IWL_DEBUG_MAC80211(priv, "leave\n");
 }

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 731f287c0f35ddd0478054ee4ff6b0de611c842c..78abff0045341bb00c5e5aa46018fd2462494fb9 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -1149,8 +1149,10 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
        if (test_bit(STATUS_INT_ENABLED, &trans->shrd->status))
                iwl_enable_interrupts(trans);
        /* Re-enable RF_KILL if it occurred */
-       else if (handled & CSR_INT_BIT_RF_KILL)
-               iwl_enable_rfkill_int(priv(trans));
+       else if (handled & CSR_INT_BIT_RF_KILL) {
+               IWL_DEBUG_ISR(trans, "Enabling rfkill interrupt\n");
+               iwl_write32(trans, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
+       }
 }
 
 /******************************************************************************

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index ed2a9216d80784376a4ba72c1d871b2a72dc150a..ec26950ebb554ff5cf84efd5aa613753d88a96df 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1532,6 +1532,8 @@ static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans)
 {
        iwl_apm_stop(trans);
 
+       iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
+
        /* Even if we stop the HW, we still want the RF kill interrupt */
        IWL_DEBUG_ISR(trans, "Enabling rfkill interrupt\n");
        iwl_write32(trans, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);