ath9k_hw: remove MCI_STATE_SET_BT_SLEEP
authorRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Tue, 12 Jun 2012 14:48:23 +0000 (20:18 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 18:36:02 +0000 (14:36 -0400)
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ar9003_mci.c
drivers/net/wireless/ath/ath9k/ar9003_mci.h
drivers/net/wireless/ath/ath9k/mci.c

index 25f99ef48b200c165f9bff8e555d0250a78ed577..cc2853ade8f89cb7221f7b7a9f713d35bfdc6317 100644 (file)
@@ -1191,9 +1191,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
                           AR_MCI_RX_REMOTE_SLEEP) ?
                        MCI_BT_SLEEP : MCI_BT_AWAKE;
                break;
-       case MCI_STATE_SET_BT_SLEEP:
-               mci->bt_state = MCI_BT_SLEEP;
-               break;
        case MCI_STATE_SET_BT_AWAKE:
                mci->bt_state = MCI_BT_AWAKE;
                ar9003_mci_send_coex_version_query(ah, true);
index 98bfc62d6b9bd6de9d796f4b88d9619efcc98c85..d33b8e1288554dd502dc290d68c8c45684d2e1a8 100644 (file)
@@ -189,7 +189,6 @@ enum mci_bt_state {
 /* Type of state query */
 enum mci_state_type {
        MCI_STATE_ENABLE,
-       MCI_STATE_SET_BT_SLEEP,
        MCI_STATE_SET_BT_AWAKE,
        MCI_STATE_SET_BT_CAL_START,
        MCI_STATE_SET_BT_CAL,
index e83d7200f762eff22895ede3d69a5f1118685b12..7d34a504d6171b0370ede10581df1617c59ff5d0 100644 (file)
@@ -455,7 +455,7 @@ void ath_mci_intr(struct ath_softc *sc)
                if ((mci_hw->bt_state == MCI_BT_AWAKE) &&
                    (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP) !=
                     MCI_BT_AWAKE))
-                       ar9003_mci_state(ah, MCI_STATE_SET_BT_SLEEP);
+                       mci_hw->bt_state = MCI_BT_SLEEP;
        }
 
        if ((mci_int & AR_MCI_INTERRUPT_RX_INVALID_HDR) ||