UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: Fix ath_startrecv() 

Since ath_startrecv() doesn't return an error value,
cleanup the callsites.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith Manoharan 2014-09-05 08:03:16 +05:30 committed by John W. Linville
parent 9019f646b2
commit 19ec477f16
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@ -527,7 +527,7 @@ static inline void ath_chanctx_check_active(struct ath_softc *sc,
#endif /* CONFIG_ATH9K_CHANNEL_CONTEXT */ #endif /* CONFIG_ATH9K_CHANNEL_CONTEXT */
int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan); int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan);
int ath_startrecv(struct ath_softc *sc); void ath_startrecv(struct ath_softc *sc);
bool ath_stoprecv(struct ath_softc *sc); bool ath_stoprecv(struct ath_softc *sc);
u32 ath_calcrxfilter(struct ath_softc *sc); u32 ath_calcrxfilter(struct ath_softc *sc);
int ath_rx_init(struct ath_softc *sc, int nbufs); int ath_rx_init(struct ath_softc *sc, int nbufs);

8
drivers/net/wireless/ath/ath9k/main.c
View File

@ -225,15 +225,9 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
unsigned long flags; unsigned long flags;
ath9k_calculate_summary_state(sc, sc->cur_chan); ath9k_calculate_summary_state(sc, sc->cur_chan);
ath_startrecv(sc);
if (ath_startrecv(sc) != 0) {
ath_err(common, "Unable to restart recv logic\n");
return false;
}
ath9k_cmn_update_txpow(ah, sc->curtxpow, ath9k_cmn_update_txpow(ah, sc->curtxpow,
sc->cur_chan->txpower, &sc->curtxpow); sc->cur_chan->txpower, &sc->curtxpow);
clear_bit(ATH_OP_HW_RESET, &common->op_flags); clear_bit(ATH_OP_HW_RESET, &common->op_flags);
if (!sc->cur_chan->offchannel && start) { if (!sc->cur_chan->offchannel && start) {

6
drivers/net/wireless/ath/ath9k/recv.c
View File

@ -433,14 +433,14 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
} }
int ath_startrecv(struct ath_softc *sc) void ath_startrecv(struct ath_softc *sc)
{ {
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
struct ath_rxbuf *bf, *tbf; struct ath_rxbuf *bf, *tbf;
if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) { if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
ath_edma_start_recv(sc); ath_edma_start_recv(sc);
return 0; return;
} }
if (list_empty(&sc->rx.rxbuf)) if (list_empty(&sc->rx.rxbuf))
@ -463,8 +463,6 @@ int ath_startrecv(struct ath_softc *sc)
start_recv: start_recv:
ath_opmode_init(sc); ath_opmode_init(sc);
ath9k_hw_startpcureceive(ah, sc->cur_chan->offchannel); ath9k_hw_startpcureceive(ah, sc->cur_chan->offchannel);
return 0;
} }
static void ath_flushrecv(struct ath_softc *sc) static void ath_flushrecv(struct ath_softc *sc)