diff options
author | Vivek Natarajan <vnatarajan@atheros.com> | 2011-04-26 01:09:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-28 14:50:00 -0400 |
commit | 978f78bf71372a48785ac9407ebc10170f14f56c (patch) | |
tree | 5d68d324e0502503ab02fefc7feae7c2f328e117 /drivers/net/wireless/ath/ath9k/gpio.c | |
parent | 8178d38b704f0a08a74b030c35e6eca5f5019d3d (diff) |
ath9k_hw: Move bt_stomp to hw from common.
Move bt_stomp to ath9k_hw and add its support for latest chipsets.
Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/gpio.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/gpio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c index 2c59452a7207..3a4ddd19e60e 100644 --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c | |||
@@ -176,7 +176,6 @@ static void ath_btcoex_period_timer(unsigned long data) | |||
176 | struct ath_softc *sc = (struct ath_softc *) data; | 176 | struct ath_softc *sc = (struct ath_softc *) data; |
177 | struct ath_hw *ah = sc->sc_ah; | 177 | struct ath_hw *ah = sc->sc_ah; |
178 | struct ath_btcoex *btcoex = &sc->btcoex; | 178 | struct ath_btcoex *btcoex = &sc->btcoex; |
179 | struct ath_common *common = ath9k_hw_common(ah); | ||
180 | u32 timer_period; | 179 | u32 timer_period; |
181 | bool is_btscan; | 180 | bool is_btscan; |
182 | 181 | ||
@@ -186,7 +185,7 @@ static void ath_btcoex_period_timer(unsigned long data) | |||
186 | 185 | ||
187 | spin_lock_bh(&btcoex->btcoex_lock); | 186 | spin_lock_bh(&btcoex->btcoex_lock); |
188 | 187 | ||
189 | ath9k_cmn_btcoex_bt_stomp(common, is_btscan ? ATH_BTCOEX_STOMP_ALL : | 188 | ath9k_hw_btcoex_bt_stomp(ah, is_btscan ? ATH_BTCOEX_STOMP_ALL : |
190 | btcoex->bt_stomp_type); | 189 | btcoex->bt_stomp_type); |
191 | 190 | ||
192 | spin_unlock_bh(&btcoex->btcoex_lock); | 191 | spin_unlock_bh(&btcoex->btcoex_lock); |
@@ -224,9 +223,9 @@ static void ath_btcoex_no_stomp_timer(void *arg) | |||
224 | spin_lock_bh(&btcoex->btcoex_lock); | 223 | spin_lock_bh(&btcoex->btcoex_lock); |
225 | 224 | ||
226 | if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan) | 225 | if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan) |
227 | ath9k_cmn_btcoex_bt_stomp(common, ATH_BTCOEX_STOMP_NONE); | 226 | ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE); |
228 | else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL) | 227 | else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL) |
229 | ath9k_cmn_btcoex_bt_stomp(common, ATH_BTCOEX_STOMP_LOW); | 228 | ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW); |
230 | 229 | ||
231 | spin_unlock_bh(&btcoex->btcoex_lock); | 230 | spin_unlock_bh(&btcoex->btcoex_lock); |
232 | } | 231 | } |