aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2012-06-04 06:57:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-06 15:20:24 -0400
commit83c7a52dcce256fc20cd43dbf6866e3e05f2bf71 (patch)
tree61e262259643aff08e529238c84a159edafea022
parente270e776a0985511146555e79edbe53539809adb (diff)
ath9k_hw: Fix AR_RTC_KEEP_AWAKE usage
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>
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_mci.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c11
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index ffbb180f91e1..9331d73f69aa 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -330,7 +330,6 @@ void ar9003_mci_set_full_sleep(struct ath_hw *ah)
330 } 330 }
331 331
332 mci->ready = false; 332 mci->ready = false;
333 REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
334} 333}
335 334
336static void ar9003_mci_disable_interrupt(struct ath_hw *ah) 335static void ar9003_mci_disable_interrupt(struct ath_hw *ah)
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index febf6971b40a..42cf3c8db95b 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1432,9 +1432,6 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
1432 break; 1432 break;
1433 } 1433 }
1434 1434
1435 if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
1436 REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
1437
1438 return ret; 1435 return ret;
1439} 1436}
1440 1437
@@ -2167,10 +2164,6 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
2167 switch (mode) { 2164 switch (mode) {
2168 case ATH9K_PM_AWAKE: 2165 case ATH9K_PM_AWAKE:
2169 status = ath9k_hw_set_power_awake(ah, setChip); 2166 status = ath9k_hw_set_power_awake(ah, setChip);
2170
2171 if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
2172 REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
2173
2174 break; 2167 break;
2175 case ATH9K_PM_FULL_SLEEP: 2168 case ATH9K_PM_FULL_SLEEP:
2176 if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI) 2169 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)
2180 ah->chip_fullsleep = true; 2173 ah->chip_fullsleep = true;
2181 break; 2174 break;
2182 case ATH9K_PM_NETWORK_SLEEP: 2175 case ATH9K_PM_NETWORK_SLEEP:
2183
2184 if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
2185 REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
2186
2187 ath9k_set_power_network_sleep(ah, setChip); 2176 ath9k_set_power_network_sleep(ah, setChip);
2188 break; 2177 break;
2189 default: 2178 default: