aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/gpio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/gpio.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/gpio.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index da344b27326c..78695b59d6fc 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)
271 ath9k_ps_restore(sc); 271 ath9k_ps_restore(sc);
272} 272}
273 273
274static int ath_init_btcoex_timer(struct ath_softc *sc) 274static void ath_init_btcoex_timer(struct ath_softc *sc)
275{ 275{
276 struct ath_btcoex *btcoex = &sc->btcoex; 276 struct ath_btcoex *btcoex = &sc->btcoex;
277 277
@@ -287,8 +287,6 @@ static int ath_init_btcoex_timer(struct ath_softc *sc)
287 (unsigned long) sc); 287 (unsigned long) sc);
288 288
289 spin_lock_init(&btcoex->btcoex_lock); 289 spin_lock_init(&btcoex->btcoex_lock);
290
291 return 0;
292} 290}
293 291
294/* 292/*
@@ -409,9 +407,8 @@ int ath9k_init_btcoex(struct ath_softc *sc)
409 break; 407 break;
410 case ATH_BTCOEX_CFG_3WIRE: 408 case ATH_BTCOEX_CFG_3WIRE:
411 ath9k_hw_btcoex_init_3wire(sc->sc_ah); 409 ath9k_hw_btcoex_init_3wire(sc->sc_ah);
412 r = ath_init_btcoex_timer(sc); 410 ath_init_btcoex_timer(sc);
413 if (r) 411
414 return -1;
415 txq = sc->tx.txq_map[IEEE80211_AC_BE]; 412 txq = sc->tx.txq_map[IEEE80211_AC_BE];
416 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum); 413 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
417 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW; 414 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;