diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2012-06-12 10:48:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 14:36:02 -0400 |
commit | 9330969b8fd1304fdcb7c1825f1528eea38d321c (patch) | |
tree | 482a320ad6e558024216f02d36609b654faf4738 /drivers | |
parent | 26e942b790eddc757b5be179ef67907e025ff87b (diff) |
ath9k_hw: remove MCI_STATE_SET_BT_SLEEP
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_mci.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_mci.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mci.c | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c index 25f99ef48b20..cc2853ade8f8 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c | |||
@@ -1191,9 +1191,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type) | |||
1191 | AR_MCI_RX_REMOTE_SLEEP) ? | 1191 | AR_MCI_RX_REMOTE_SLEEP) ? |
1192 | MCI_BT_SLEEP : MCI_BT_AWAKE; | 1192 | MCI_BT_SLEEP : MCI_BT_AWAKE; |
1193 | break; | 1193 | break; |
1194 | case MCI_STATE_SET_BT_SLEEP: | ||
1195 | mci->bt_state = MCI_BT_SLEEP; | ||
1196 | break; | ||
1197 | case MCI_STATE_SET_BT_AWAKE: | 1194 | case MCI_STATE_SET_BT_AWAKE: |
1198 | mci->bt_state = MCI_BT_AWAKE; | 1195 | mci->bt_state = MCI_BT_AWAKE; |
1199 | ar9003_mci_send_coex_version_query(ah, true); | 1196 | ar9003_mci_send_coex_version_query(ah, true); |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h index 98bfc62d6b9b..d33b8e128855 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_mci.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.h | |||
@@ -189,7 +189,6 @@ enum mci_bt_state { | |||
189 | /* Type of state query */ | 189 | /* Type of state query */ |
190 | enum mci_state_type { | 190 | enum mci_state_type { |
191 | MCI_STATE_ENABLE, | 191 | MCI_STATE_ENABLE, |
192 | MCI_STATE_SET_BT_SLEEP, | ||
193 | MCI_STATE_SET_BT_AWAKE, | 192 | MCI_STATE_SET_BT_AWAKE, |
194 | MCI_STATE_SET_BT_CAL_START, | 193 | MCI_STATE_SET_BT_CAL_START, |
195 | MCI_STATE_SET_BT_CAL, | 194 | MCI_STATE_SET_BT_CAL, |
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c index e83d7200f762..7d34a504d617 100644 --- a/drivers/net/wireless/ath/ath9k/mci.c +++ b/drivers/net/wireless/ath/ath9k/mci.c | |||
@@ -455,7 +455,7 @@ void ath_mci_intr(struct ath_softc *sc) | |||
455 | if ((mci_hw->bt_state == MCI_BT_AWAKE) && | 455 | if ((mci_hw->bt_state == MCI_BT_AWAKE) && |
456 | (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP) != | 456 | (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP) != |
457 | MCI_BT_AWAKE)) | 457 | MCI_BT_AWAKE)) |
458 | ar9003_mci_state(ah, MCI_STATE_SET_BT_SLEEP); | 458 | mci_hw->bt_state = MCI_BT_SLEEP; |
459 | } | 459 | } |
460 | 460 | ||
461 | if ((mci_int & AR_MCI_INTERRUPT_RX_INVALID_HDR) || | 461 | if ((mci_int & AR_MCI_INTERRUPT_RX_INVALID_HDR) || |