openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: Use ps wrappers for btcoex logic. 

Use ps wrappers before accessing hw registers in btcoex.

Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Vivek Natarajan 2011-04-26 10:39:55 +05:30 committed by John W. Linville
parent f78eb657f0
commit a039a99349
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath9k/gpio.c
View File

@ -179,6 +179,7 @@ static void ath_btcoex_period_timer(unsigned long data)
u32 timer_period; u32 timer_period;
bool is_btscan; bool is_btscan;
ath9k_ps_wakeup(sc);
ath_detect_bt_priority(sc); ath_detect_bt_priority(sc);
is_btscan = sc->sc_flags & SC_OP_BT_SCAN; is_btscan = sc->sc_flags & SC_OP_BT_SCAN;
@ -201,6 +202,7 @@ static void ath_btcoex_period_timer(unsigned long data)
btcoex->hw_timer_enabled = true; btcoex->hw_timer_enabled = true;
} }
ath9k_ps_restore(sc);
mod_timer(&btcoex->period_timer, jiffies + mod_timer(&btcoex->period_timer, jiffies +
msecs_to_jiffies(ATH_BTCOEX_DEF_BT_PERIOD)); msecs_to_jiffies(ATH_BTCOEX_DEF_BT_PERIOD));
} }
@ -220,6 +222,7 @@ static void ath_btcoex_no_stomp_timer(void *arg)
ath_dbg(common, ATH_DBG_BTCOEX, ath_dbg(common, ATH_DBG_BTCOEX,
"no stomp timer running\n"); "no stomp timer running\n");
ath9k_ps_wakeup(sc);
spin_lock_bh(&btcoex->btcoex_lock); spin_lock_bh(&btcoex->btcoex_lock);
if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan) if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan)
@ -228,6 +231,7 @@ static void ath_btcoex_no_stomp_timer(void *arg)
ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW); ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);
spin_unlock_bh(&btcoex->btcoex_lock); spin_unlock_bh(&btcoex->btcoex_lock);
ath9k_ps_restore(sc);
} }
int ath_init_btcoex_timer(struct ath_softc *sc) int ath_init_btcoex_timer(struct ath_softc *sc)