ath9k: rename driver core and hw power save helpers

ath9k_hw_setpower_nolock --> ath9k_hw_setpower()
ath9k_hw_setpower() --> ath9k_setpower()

Also change the param for ath9k_setpower() to pass the ath_softc.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index e71fe24cd3d..cb352daf2dc 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -919,7 +919,7 @@ int ath9k_hw_init(struct ath_hw *ah)
                 return -EIO;
         }
 
-        if (!ath9k_hw_setpower_nolock(ah, ATH9K_PM_AWAKE)) {
+        if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) {
                 DPRINTF(ah, ATH_DBG_FATAL, "Couldn't wakeup chip\n");
                 return -EIO;
         }
@@ -1234,7 +1234,7 @@ void ath9k_hw_detach(struct ath_hw *ah)
                 ath9k_hw_ani_disable(ah);
 
         ath9k_hw_rf_free(ah);
-        ath9k_hw_setpower_nolock(ah, ATH9K_PM_FULL_SLEEP);
+        ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);
         kfree(ah);
         ah = NULL;
 }
@@ -1800,7 +1800,7 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah,
         } else if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM))
                 return false;
 
-        if (!ath9k_hw_setpower_nolock(ah, ATH9K_PM_AWAKE))
+        if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
                 return false;
 
         ah->chip_fullsleep = false;
@@ -2355,7 +2355,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ah->txchainmask = sc->tx_chainmask;
         ah->rxchainmask = sc->rx_chainmask;
 
-        if (!ath9k_hw_setpower_nolock(ah, ATH9K_PM_AWAKE))
+        if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
                 return -EIO;
 
         if (curchan && !ah->chip_fullsleep)
@@ -2932,7 +2932,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
         return true;
 }
 
-bool ath9k_hw_setpower_nolock(struct ath_hw *ah, enum ath9k_power_mode mode)
+bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
 {
         int status = true, setChip = true;
         static const char *modes[] = {
@@ -3986,7 +3986,7 @@ bool ath9k_hw_phy_disable(struct ath_hw *ah)
 
 bool ath9k_hw_disable(struct ath_hw *ah)
 {
-        if (!ath9k_hw_setpower_nolock(ah, ATH9K_PM_AWAKE))
+        if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
                 return false;
 
         return ath9k_hw_set_reset_reg(ah, ATH9K_RESET_COLD);