Message ID | 1425191029-13667-2-git-send-email-sujith@msujith.org (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Kalle Valo |
Headers | show |
> From: Sujith Manoharan <c_manoha@qca.qualcomm.com> > > ath_init_btcoex_timer() always returns 0, so > checking for error conditions is not required. > > Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Thanks, 6 patches applied to wireless-drivers-next.git: 44b9b56e5095 ath9k: Remove useless return value check 510baea1e46d ath9k: Initialize MCI state correctly e1ff147d878a ath9k: Fix MCI scheme initialization 30b818989100 ath9k: Fix wlan-active gpio for the AR9003 family c7266e99b1b0 ath9k: Handle timers for MCI 6e6dd08dd320 ath9k: Fix issues in the main btcoex timer Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c index da344b2..78695b5 100644 --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c @@ -271,7 +271,7 @@ static void ath_btcoex_no_stomp_timer(unsigned long arg) ath9k_ps_restore(sc); } -static int ath_init_btcoex_timer(struct ath_softc *sc) +static void ath_init_btcoex_timer(struct ath_softc *sc) { struct ath_btcoex *btcoex = &sc->btcoex; @@ -287,8 +287,6 @@ static int ath_init_btcoex_timer(struct ath_softc *sc) (unsigned long) sc); spin_lock_init(&btcoex->btcoex_lock); - - return 0; } /* @@ -409,9 +407,8 @@ int ath9k_init_btcoex(struct ath_softc *sc) break; case ATH_BTCOEX_CFG_3WIRE: ath9k_hw_btcoex_init_3wire(sc->sc_ah); - r = ath_init_btcoex_timer(sc); - if (r) - return -1; + ath_init_btcoex_timer(sc); + txq = sc->tx.txq_map[IEEE80211_AC_BE]; ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum); sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;