diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-10-17 06:10:11 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-27 21:16:14 +0300 |
| commit | 5555c955249b0d942e8ae066e80a24237b16e7f8 (patch) | |
| tree | d7807688aac63d1e9d109ca91a0cb5fc21da6d5e /drivers/net/wireless/ath/ath9k/main.c | |
| parent | be247c1faeeead695378989a0806951ebf0403ae (diff) | |
| download | linux-5555c955249b0d942e8ae066e80a24237b16e7f8.tar.xz | |
ath9k: Unify reset API
Instead of having ath_reset_internal() and ath_reset()
as two separate calls to perform a HW reset, have
one function. This makes sure that the behavior will
be the same at all callsites.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 446bc46733f9..eb6ba9f8d9ff 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -270,7 +270,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) return true; } -int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan) +static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan) { struct ath_hw *ah = sc->sc_ah; struct ath_common *common = ath9k_hw_common(ah); @@ -598,12 +598,12 @@ chip_reset: #undef SCHED_INTR } -int ath_reset(struct ath_softc *sc) +int ath_reset(struct ath_softc *sc, struct ath9k_channel *hchan) { int r; ath9k_ps_wakeup(sc); - r = ath_reset_internal(sc, NULL); + r = ath_reset_internal(sc, hchan); ath9k_ps_restore(sc); return r; @@ -623,7 +623,9 @@ void ath_reset_work(struct work_struct *work) { struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work); - ath_reset(sc); + ath9k_ps_wakeup(sc); + ath_reset_internal(sc, NULL); + ath9k_ps_restore(sc); } /**********************/ @@ -2044,7 +2046,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop) spin_unlock_bh(&sc->sc_pcu_lock); if (!drain_txq) - ath_reset(sc); + ath_reset(sc, NULL); ath9k_ps_restore(sc); } |