Commit 64ab38df authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Remove ATH_BTCOEX_CFG_NONE checks 



Since BTCOEX code can be compiled out cleanly now,
remove these checks.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9d5b80fd

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

+0 −21
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum) 
	u32 i, idx;

	bool rxclear_polarity = ath_bt_config.bt_rxclear_polarity;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	if (AR_SREV_9300_20_OR_LATER(ah))

		rxclear_polarity = !ath_bt_config.bt_rxclear_polarity;
@@ -136,9 +133,6 @@ void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah) 
{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	/* connect bt_active to baseband */

	REG_CLR_BIT(ah, AR_GPIO_INPUT_EN_VAL,

		    (AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_DEF |
@@ -161,9 +155,6 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah) 
{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	/* btcoex 3-wire */

	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,

			(AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_BB |
@@ -214,9 +205,6 @@ static void ath9k_hw_btcoex_enable_2wire(struct ath_hw *ah) 
{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	/* Configure the desired GPIO port for TX_FRAME output */

	ath9k_hw_cfg_output(ah, btcoex_hw->wlanactive_gpio,

			    AR_GPIO_OUTPUT_MUX_AS_TX_FRAME);
@@ -228,9 +216,6 @@ void ath9k_hw_btcoex_set_weight(struct ath_hw *ah, 
{

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



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

				     SM(wlan_weight, AR_BTCOEX_WL_WGHT);

}
@@ -319,9 +304,6 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah) 
	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;

	int i;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	btcoex_hw->enabled = false;

	if (btcoex_hw->scheme == ATH_BTCOEX_CFG_MCI) {

		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
@@ -370,9 +352,6 @@ static void ar9003_btcoex_bt_stomp(struct ath_hw *ah, 
void ath9k_hw_btcoex_bt_stomp(struct ath_hw *ah,

			      enum ath_stomp_type stomp_type)

{

	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	if (AR_SREV_9300_20_OR_LATER(ah)) {

		ar9003_btcoex_bt_stomp(ah, stomp_type);

		return;

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

+0 −9
Original line number Diff line number Diff line
@@ -251,9 +251,6 @@ static int ath_init_btcoex_timer(struct ath_softc *sc) 
{

	struct ath_btcoex *btcoex = &sc->btcoex;



	if (ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_NONE)

		return 0;



	btcoex->btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD * 1000;

	btcoex->btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) *

		btcoex->btcoex_period / 100;
@@ -286,9 +283,6 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc) 


	ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex timers\n");



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	/* make sure duty cycle timer is also stopped when resuming */

	if (btcoex->hw_timer_enabled)

		ath9k_gen_timer_stop(sc->sc_ah, btcoex->no_stomp_timer);
@@ -309,9 +303,6 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc) 
	struct ath_btcoex *btcoex = &sc->btcoex;

	struct ath_hw *ah = sc->sc_ah;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	del_timer_sync(&btcoex->period_timer);



	if (btcoex->hw_timer_enabled)

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

+0 −11
Original line number Diff line number Diff line
@@ -119,9 +119,6 @@ static void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv) 
{

	struct ath_btcoex *btcoex = &priv->btcoex;



	if (ath9k_hw_get_btcoex_scheme(priv->ah) == ATH_BTCOEX_CFG_NONE)

		return;



	btcoex->btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD;

	btcoex->btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) *

		btcoex->btcoex_period / 100;
@@ -140,9 +137,6 @@ static void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv) 
	struct ath_btcoex *btcoex = &priv->btcoex;

	struct ath_hw *ah = priv->ah;



	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

		return;



	ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex work\n");



	btcoex->bt_priority_cnt = 0;
@@ -157,9 +151,6 @@ static void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv) 
 */

static void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv)

{

	if (ath9k_hw_get_btcoex_scheme(priv->ah) == ATH_BTCOEX_CFG_NONE)

		return;



	cancel_delayed_work_sync(&priv->coex_period_work);

	cancel_delayed_work_sync(&priv->duty_cycle_work);

}
@@ -195,8 +186,6 @@ void ath9k_htc_init_btcoex(struct ath9k_htc_priv *priv, char *product) 


	if (product && strncmp(product, ATH_HTC_BTCOEX_PRODUCT_ID, 5) == 0) {

		ah->btcoex_hw.scheme = ATH_BTCOEX_CFG_3WIRE;

		if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)

			return;

	}



	switch (ath9k_hw_get_btcoex_scheme(priv->ah)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ ath9k_hw_get_btcoex_scheme(struct ath_hw *ah) 
{

	return ATH_BTCOEX_CFG_NONE;

}

#endif

#endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */



#define ATH9K_CLOCK_RATE_CCK		22

#define ATH9K_CLOCK_RATE_5GHZ_OFDM	40