Commit 5e197292 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: now move ath9k_hw_btcoex_set_weight() to btcoex.c 



After some necessary cleanups we now move ath9k_hw_btcoex_set_weight()
to where it belongs.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 269ad812

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

+10 −0
Original line number Diff line number Diff line
@@ -124,6 +124,16 @@ static void ath9k_hw_btcoex_enable_2wire(struct ath_hw *ah) 
			    AR_GPIO_OUTPUT_MUX_AS_TX_FRAME);

}



void ath9k_hw_btcoex_set_weight(struct ath_hw *ah,

				u32 bt_weight,

				u32 wlan_weight)

{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;



	btcoex_hw->bt_coex_weights = SM(bt_weight, AR_BTCOEX_BT_WGHT) |

				     SM(wlan_weight, AR_BTCOEX_WL_WGHT);

}



static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah)

{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;

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

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ bool ath_btcoex_supported(u16 subsysid); 
void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah);

void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah);

void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum);

void ath9k_hw_btcoex_set_weight(struct ath_hw *ah,

				u32 bt_weight,

				u32 wlan_weight);

void ath9k_hw_btcoex_enable(struct ath_hw *ah);

void ath9k_hw_btcoex_disable(struct ath_hw *ah);

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

+2 −16
Original line number Diff line number Diff line
@@ -1332,21 +1332,6 @@ static void ath_detect_bt_priority(struct ath_softc *sc) 
	}

}



static void ath9k_hw_btcoex_set_weight(struct ath_hw *ah,

				       u32 bt_weight,

				       u32 wlan_weight)

{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;



	btcoex_hw->bt_coex_weights = SM(bt_weight, AR_BTCOEX_BT_WGHT) |

				     SM(wlan_weight, AR_BTCOEX_WL_WGHT);

}



static void ath9k_hw_btcoex_init_weight(struct ath_hw *ah)

{

	ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT, AR_STOMP_LOW_WLAN_WGHT);

}



/*

 * Configures appropriate weight based on stomp type.

 */
@@ -2200,7 +2185,8 @@ static int ath9k_start(struct ieee80211_hw *hw) 


	if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &&

	    !ah->btcoex_hw.enabled) {

		ath9k_hw_btcoex_init_weight(ah);

		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,

					   AR_STOMP_LOW_WLAN_WGHT);

		ath9k_hw_btcoex_enable(ah);



		ath_pcie_aspm_disable(sc);