Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc0798b authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

ath9k: uninline ath9k_ps_{wakeup,restore} functions 



Uninline these functions before we add functional changes to them.

Changes-licensed-under: ISC
Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04717ccd

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

+2 −21
Original line number Diff line number Diff line
@@ -674,27 +674,8 @@ static inline int ath_ahb_init(void) { return 0; }; 
static inline void ath_ahb_exit(void) {};

#endif



static inline void ath9k_ps_wakeup(struct ath_softc *sc)

{

	if (atomic_inc_return(&sc->ps_usecount) == 1)

		if (sc->sc_ah->power_mode !=  ATH9K_PM_AWAKE) {

			sc->sc_ah->restore_mode = sc->sc_ah->power_mode;

			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);

		}

}



static inline void ath9k_ps_restore(struct ath_softc *sc)

{

	if (atomic_dec_and_test(&sc->ps_usecount))

		if ((sc->hw->conf.flags & IEEE80211_CONF_PS) &&

		    !(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(sc->sc_ah,

					  sc->sc_ah->restore_mode);

}



void ath9k_ps_wakeup(struct ath_softc *sc);

void ath9k_ps_restore(struct ath_softc *sc);



void ath9k_set_bssid_mask(struct ieee80211_hw *hw);

int ath9k_wiphy_add(struct ath_softc *sc);

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

+21 −0
Original line number Diff line number Diff line
@@ -2775,6 +2775,27 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode) 
	return ret;

}



void ath9k_ps_wakeup(struct ath_softc *sc)

{

	if (atomic_inc_return(&sc->ps_usecount) == 1)

		if (sc->sc_ah->power_mode != ATH9K_PM_AWAKE) {

			sc->sc_ah->restore_mode = sc->sc_ah->power_mode;

			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);

		}

}



void ath9k_ps_restore(struct ath_softc *sc)

{

	if (atomic_dec_and_test(&sc->ps_usecount))

		if ((sc->hw->conf.flags & IEEE80211_CONF_PS) &&

		    !(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(sc->sc_ah,

					  sc->sc_ah->restore_mode);

}



/*

 * Helper for ASPM support.

 *