iwlwifi: remove rfkill warning from iwl-io

The patch removes the warning since registers might be accessed also
during rfkill.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-io.h b/drivers/net/wireless/iwlwifi/iwl-3945-io.h
index 98740e8842f3d10f02095212dd80b681f3202c0f..b3fe48de3ae7b819d17bffd7cd7d01013cd632b1 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-io.h
@@ -153,28 +153,10 @@ static inline void __iwl3945_clear_bit(const char *f, u32 l,
 static inline int _iwl3945_grab_nic_access(struct iwl3945_priv *priv)
 {
        int ret;
-       u32 gp_ctl;
-
 #ifdef CONFIG_IWL3945_DEBUG
        if (atomic_read(&priv->restrict_refcnt))
                return 0;
 #endif
-       if (test_bit(STATUS_RF_KILL_HW, &priv->status) ||
-           test_bit(STATUS_RF_KILL_SW, &priv->status)) {
-               IWL_WARNING("WARNING: Requesting MAC access during RFKILL "
-                       "wakes up NIC\n");
-
-               /* 10 msec allows time for NIC to complete its data save */
-               gp_ctl = _iwl3945_read32(priv, CSR_GP_CNTRL);
-               if (gp_ctl & CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY) {
-                       IWL_DEBUG_RF_KILL("Wait for complete power-down, "
-                               "gpctl = 0x%08x\n", gp_ctl);
-                       mdelay(10);
-               } else
-                       IWL_DEBUG_RF_KILL("power-down complete, "
-                                         "gpctl = 0x%08x\n", gp_ctl);
-       }
-
        /* this bit wakes up the NIC */
        _iwl3945_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
        ret = _iwl3945_poll_bit(priv, CSR_GP_CNTRL,

diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index 17fb4e2e7c22399439eee8e0b213d1f79795f662..9740fcc1805e7eb27f99ed6fd3ccd711aadcccf2 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -155,28 +155,10 @@ static inline void __iwl_clear_bit(const char *f, u32 l,
 static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
 {
        int ret;
-       u32 gp_ctl;
-
 #ifdef CONFIG_IWLWIFI_DEBUG
        if (atomic_read(&priv->restrict_refcnt))
                return 0;
 #endif
-       if (test_bit(STATUS_RF_KILL_HW, &priv->status) ||
-           test_bit(STATUS_RF_KILL_SW, &priv->status)) {
-               IWL_WARNING("WARNING: Requesting MAC access during RFKILL "
-                       "wakes up NIC\n");
-
-               /* 10 msec allows time for NIC to complete its data save */
-               gp_ctl = _iwl_read32(priv, CSR_GP_CNTRL);
-               if (gp_ctl & CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY) {
-                       IWL_DEBUG_RF_KILL("Wait for complete power-down, "
-                               "gpctl = 0x%08x\n", gp_ctl);
-                       mdelay(10);
-               } else
-                       IWL_DEBUG_RF_KILL("power-down complete, "
-                                         "gpctl = 0x%08x\n", gp_ctl);
-       }
-
        /* this bit wakes up the NIC */
        _iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
        ret = _iwl_poll_bit(priv, CSR_GP_CNTRL,