ath9k: move ath9k_hw_setpower() to main.c
Luis R. Rodriguez [Thu, 10 Sep 2009 04:02:34 +0000 (21:02 -0700)]
And we make it static.

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

drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/main.c

index 9107262..e71fe24 100644 (file)
@@ -2969,18 +2969,6 @@ bool ath9k_hw_setpower_nolock(struct ath_hw *ah, enum ath9k_power_mode mode)
        return status;
 }
 
-bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
-{
-       unsigned long flags;
-       bool ret;
-
-       spin_lock_irqsave(&ah->ah_sc->sc_pm_lock, flags);
-       ret = ath9k_hw_setpower_nolock(ah, mode);
-       spin_unlock_irqrestore(&ah->ah_sc->sc_pm_lock, flags);
-
-       return ret;
-}
-
 /*
  * Helper for ASPM support.
  *
index 01a127b..05e4f8b 100644 (file)
@@ -654,7 +654,6 @@ void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,
                                    const struct ath9k_beacon_state *bs);
 
 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);
 
 void ath9k_hw_configpcipowersave(struct ath_hw *ah, int restore, int power_off);
 
index 9f9ac5b..d0637a6 100644 (file)
@@ -243,6 +243,18 @@ static struct ath9k_channel *ath_get_curchannel(struct ath_softc *sc,
        return channel;
 }
 
+static bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
+{
+       unsigned long flags;
+       bool ret;
+
+       spin_lock_irqsave(&ah->ah_sc->sc_pm_lock, flags);
+       ret = ath9k_hw_setpower_nolock(ah, mode);
+       spin_unlock_irqrestore(&ah->ah_sc->sc_pm_lock, flags);
+
+       return ret;
+}
+
 void ath9k_ps_wakeup(struct ath_softc *sc)
 {
        unsigned long flags;