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

ath9k: move ath9k_ps_wakeup() and ath9k_ps_restore() to main.c 



These are driver core helpers.

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

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

+1 −35
Original line number Diff line number Diff line
@@ -2932,8 +2932,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip) 
	return true;

}



static bool ath9k_hw_setpower_nolock(struct ath_hw *ah,

				     enum ath9k_power_mode mode)

bool ath9k_hw_setpower_nolock(struct ath_hw *ah, enum ath9k_power_mode mode)

{

	int status = true, setChip = true;

	static const char *modes[] = {
@@ -2982,39 +2981,6 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode) 
	return ret;

}



void ath9k_ps_wakeup(struct ath_softc *sc)

{

	unsigned long flags;



	spin_lock_irqsave(&sc->sc_pm_lock, flags);

	if (++sc->ps_usecount != 1)

		goto unlock;



	ath9k_hw_setpower_nolock(sc->sc_ah, ATH9K_PM_AWAKE);



 unlock:

	spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

}



void ath9k_ps_restore(struct ath_softc *sc)

{

	unsigned long flags;



	spin_lock_irqsave(&sc->sc_pm_lock, flags);

	if (--sc->ps_usecount != 0)

		goto unlock;



	if (sc->ps_enabled &&

	    !(sc->sc_flags & (SC_OP_WAIT_FOR_BEACON |

			      SC_OP_WAIT_FOR_CAB |

			      SC_OP_WAIT_FOR_PSPOLL_DATA |

			      SC_OP_WAIT_FOR_TX_ACK)))

		ath9k_hw_setpower_nolock(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);



 unlock:

	spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

}



/*

 * Helper for ASPM support.

 *

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

+4 −2
Original line number Diff line number Diff line
@@ -652,8 +652,10 @@ void ath9k_hw_set11nmac2040(struct ath_hw *ah, enum ath9k_ht_macmode mode); 
void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);

void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,

				    const struct ath9k_beacon_state *bs);

bool ath9k_hw_setpower(struct ath_hw *ah,

		       enum ath9k_power_mode mode);



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);



/* Interrupt Handling */

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

+33 −0
Original line number Diff line number Diff line
@@ -243,6 +243,39 @@ static struct ath9k_channel *ath_get_curchannel(struct ath_softc *sc, 
	return channel;

}



void ath9k_ps_wakeup(struct ath_softc *sc)

{

	unsigned long flags;



	spin_lock_irqsave(&sc->sc_pm_lock, flags);

	if (++sc->ps_usecount != 1)

		goto unlock;



	ath9k_hw_setpower_nolock(sc->sc_ah, ATH9K_PM_AWAKE);



 unlock:

	spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

}



void ath9k_ps_restore(struct ath_softc *sc)

{

	unsigned long flags;



	spin_lock_irqsave(&sc->sc_pm_lock, flags);

	if (--sc->ps_usecount != 0)

		goto unlock;



	if (sc->ps_enabled &&

	    !(sc->sc_flags & (SC_OP_WAIT_FOR_BEACON |

			      SC_OP_WAIT_FOR_CAB |

			      SC_OP_WAIT_FOR_PSPOLL_DATA |

			      SC_OP_WAIT_FOR_TX_ACK)))

		ath9k_hw_setpower_nolock(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);



 unlock:

	spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

}



/*

 * Set/change channels.  If the channel is really being changed, it's done

 * by reseting the chip.  To accomplish this we must first cleanup any pending