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

ath9k: add a helper to clean the core driver upon module unload 



The core driver needs to be stopped and then as a last step the
hardware needs to be stopped and its structure free'd. We do this
by moving the core driver cleanup to a new helper ath_clean_core()
and have ath_cleanup() call it. Only as a last step does
ath_cleanup() now free the hw.

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

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

+11 −2
Original line number Diff line number Diff line
@@ -1313,16 +1313,21 @@ static void ath_start_rfkill_poll(struct ath_softc *sc) 
		wiphy_rfkill_start_polling(sc->hw->wiphy);

}



static void ath_clean_core(struct ath_softc *sc);

static void ath9k_uninit_hw(struct ath_softc *sc);



void ath_cleanup(struct ath_softc *sc)

{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);



	ath_detach(sc);

	ath_clean_core(sc);

	free_irq(sc->irq, sc);

	ath_bus_cleanup(common);

	kfree(sc->sec_wiphy);

	ieee80211_free_hw(sc->hw);



	ath9k_uninit_hw(sc);

}



static void ath9k_uninit_hw(struct ath_softc *sc)
@@ -1336,7 +1341,7 @@ static void ath9k_uninit_hw(struct ath_softc *sc) 
	sc->sc_ah = NULL;

}



void ath_detach(struct ath_softc *sc)

static void ath_clean_core(struct ath_softc *sc)

{

	struct ieee80211_hw *hw = sc->hw;

	struct ath_hw *ah = sc->sc_ah;
@@ -1375,7 +1380,11 @@ void ath_detach(struct ath_softc *sc) 
	if ((sc->btcoex.no_stomp_timer) &&

	    ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)

		ath_gen_timer_free(ah, sc->btcoex.no_stomp_timer);

}



void ath_detach(struct ath_softc *sc)

{

	ath_clean_core(sc);

	ath9k_uninit_hw(sc);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE