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

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

ath9k: Remove enabling btcoex from stomp type change 



This patch removes btcoex_enable from stomp type change and let
it be called from callee functions that makes the code can be
reusable for MCI changes.

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

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

+0 −4
Original line number Diff line number Diff line
@@ -268,8 +268,6 @@ static void ar9003_btcoex_bt_stomp(struct ath_hw *ah, 
				"Invalid Stomptype\n");

		break;

	}



	ath9k_hw_btcoex_enable(ah);

}



/*
@@ -301,7 +299,5 @@ void ath9k_hw_btcoex_bt_stomp(struct ath_hw *ah, 
				"Invalid Stomptype\n");

		break;

	}



	ath9k_hw_btcoex_enable(ah);

}

EXPORT_SYMBOL(ath9k_hw_btcoex_bt_stomp);

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

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ static void ath_btcoex_period_timer(unsigned long data) 
	ath9k_hw_btcoex_bt_stomp(ah, is_btscan ? ATH_BTCOEX_STOMP_ALL :

			      btcoex->bt_stomp_type);



	ath9k_hw_btcoex_enable(ah);

	spin_unlock_bh(&btcoex->btcoex_lock);



	if (btcoex->btcoex_period != btcoex->btcoex_no_stomp) {
@@ -240,6 +241,7 @@ static void ath_btcoex_no_stomp_timer(void *arg) 
	 else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)

		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);



	ath9k_hw_btcoex_enable(ah);

	spin_unlock_bh(&btcoex->btcoex_lock);

	ath9k_ps_restore(sc);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static void ath_btcoex_period_work(struct work_struct *work) 
	ath9k_hw_btcoex_bt_stomp(priv->ah, is_btscan ? ATH_BTCOEX_STOMP_ALL :

			btcoex->bt_stomp_type);



	ath9k_hw_btcoex_enable(priv->ah);

	timer_period = is_btscan ? btcoex->btscan_no_stomp :

		btcoex->btcoex_no_stomp;

	ieee80211_queue_delayed_work(priv->hw, &priv->duty_cycle_work,
@@ -108,6 +109,7 @@ static void ath_btcoex_duty_cycle_work(struct work_struct *work) 
		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);

	else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)

		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);

	ath9k_hw_btcoex_enable(priv->ah);

}



void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv)