]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ath9k_hw: Fix AR_RTC_KEEP_AWAKE usage
authorSujith Manoharan <c_manoha@qca.qualcomm.com>
Mon, 4 Jun 2012 10:57:25 +0000 (16:27 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jun 2012 19:20:24 +0000 (15:20 -0400)
The default value that is being programmed to AR_RTC_KEEP_AWAKE
is 0x2, there is no need to program it manually in various
functions.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ar9003_mci.c
drivers/net/wireless/ath/ath9k/hw.c

index ffbb180f91e166db56106cd345d3e55553381723..9331d73f69aafdda01ac0f26cc5eb8d1a6132f1d 100644 (file)
@@ -330,7 +330,6 @@ void ar9003_mci_set_full_sleep(struct ath_hw *ah)
        }
 
        mci->ready = false;
-       REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
 }
 
 static void ar9003_mci_disable_interrupt(struct ath_hw *ah)
index febf6971b40aafd7bf5bd8c3dc7dd2ca8dac9d0f..42cf3c8db95b7aedaab9cf1f4b86fcac2e501773 100644 (file)
@@ -1432,9 +1432,6 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
                break;
        }
 
-       if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-               REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
        return ret;
 }
 
@@ -2167,10 +2164,6 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
        switch (mode) {
        case ATH9K_PM_AWAKE:
                status = ath9k_hw_set_power_awake(ah, setChip);
-
-               if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                       REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
                break;
        case ATH9K_PM_FULL_SLEEP:
                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
@@ -2180,10 +2173,6 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
                ah->chip_fullsleep = true;
                break;
        case ATH9K_PM_NETWORK_SLEEP:
-
-               if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                       REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
                ath9k_set_power_network_sleep(ah, setChip);
                break;
        default: