Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d97be48 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_hw: remove MCI_STATE_BT 



remove MCI_STATE_BT and use bt_state instead.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b98ccec0

drivers/net/wireless/ath/ath9k/ar9003_mci.c

+0 −3
Original line number Diff line number Diff line
@@ -1200,9 +1200,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type) 
	case MCI_STATE_CONT_TXRX:

		value = MS(mci->cont_status, AR_MCI_CONT_TXRX);

		break;

	case MCI_STATE_BT:

		value = mci->bt_state;

		break;

	case MCI_STATE_SET_BT_SLEEP:

		mci->bt_state = MCI_BT_SLEEP;

		break;

drivers/net/wireless/ath/ath9k/ar9003_mci.h

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ enum mci_bt_state { 
/* Type of state query */

enum mci_state_type {

	MCI_STATE_ENABLE,

	MCI_STATE_BT,

	MCI_STATE_SET_BT_SLEEP,

	MCI_STATE_SET_BT_AWAKE,

	MCI_STATE_SET_BT_CAL_START,

drivers/net/wireless/ath/ath9k/mci.c

+6 −9
Original line number Diff line number Diff line
@@ -195,20 +195,16 @@ static void ath_mci_cal_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload) 
{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;

	u32 payload[4] = {0, 0, 0, 0};



	switch (opcode) {

	case MCI_GPM_BT_CAL_REQ:

		if (ar9003_mci_state(ah, MCI_STATE_BT) == MCI_BT_AWAKE) {

		if (mci_hw->bt_state == MCI_BT_AWAKE) {

			ar9003_mci_state(ah, MCI_STATE_SET_BT_CAL_START);

			ieee80211_queue_work(sc->hw, &sc->hw_reset_work);

		} else {

			ath_dbg(common, MCI, "MCI State mismatch: %d\n",

				ar9003_mci_state(ah, MCI_STATE_BT));

		}

		break;

	case MCI_GPM_BT_CAL_DONE:

		ar9003_mci_state(ah, MCI_STATE_BT);

		ath_dbg(common, MCI, "MCI State : %d\n", mci_hw->bt_state);

		break;

	case MCI_GPM_BT_CAL_GRANT:

		MCI_GPM_SET_CAL_TYPE(payload, MCI_GPM_WLAN_CAL_DONE);
@@ -407,6 +403,7 @@ void ath_mci_intr(struct ath_softc *sc) 
	struct ath_mci_coex *mci = &sc->mci_coex;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;

	u32 mci_int, mci_int_rxmsg;

	u32 offset, subtype, opcode;

	u32 *pgpm;
@@ -446,7 +443,7 @@ void ath_mci_intr(struct ath_softc *sc) 
	if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING) {

		mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING;



		if ((ar9003_mci_state(ah, MCI_STATE_BT) == MCI_BT_SLEEP) &&

		if ((mci_hw->bt_state == MCI_BT_SLEEP) &&

		    (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP) !=

		     MCI_BT_SLEEP))

			ar9003_mci_state(ah, MCI_STATE_SET_BT_AWAKE);
@@ -455,7 +452,7 @@ void ath_mci_intr(struct ath_softc *sc) 
	if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) {

		mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING;



		if ((ar9003_mci_state(ah, MCI_STATE_BT) == MCI_BT_AWAKE) &&

		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);