Commit 8c77a569 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: move ath9k_hw_setpower() to main.c 



And we make it static.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1adc93c8

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

+0 −12
Original line number Diff line number Diff line
@@ -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.

 *

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

+0 −1
Original line number Diff line number Diff line
@@ -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);

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

+12 −0
Original line number Diff line number Diff line
@@ -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;