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

Commit 7bdea96a authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Remove "shared_chain_lnadiv" 



This variable is redundant since we can use
common->bt_ant_diversity to determine if diversity
has to be enabled/disabled.

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

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

+2 −1
Original line number Diff line number Diff line
@@ -3561,6 +3561,7 @@ static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain, 


static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)

{

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath9k_hw_capabilities *pCap = &ah->caps;

	int chain;

	u32 regval, value, gpio;
@@ -3646,7 +3647,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) 
		regval |= ((value >> 6) & 0x1) << AR_PHY_ANT_DIV_LNADIV_S;



		if (AR_SREV_9565(ah)) {

			if (ah->shared_chain_lnadiv) {

			if (common->bt_ant_diversity) {

				regval |= (1 << AR_PHY_ANT_SW_RX_PROT_S);

			} else {

				regval &= ~(1 << AR_PHY_ANT_DIV_LNADIV_S);

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

+0 −1
Original line number Diff line number Diff line
@@ -1420,7 +1420,6 @@ static void ar9003_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable) 
	if (!AR_SREV_9565(ah))

		return;



	ah->shared_chain_lnadiv = enable;

	ant_div_ctl1 = ah->eep_ops->get_eeprom(ah, EEP_ANT_DIV_CTL1);



	regval = REG_READ(ah, AR_PHY_MC_GAIN_CTRL);

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

+1 −1
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 


	ath9k_hw_apply_gpio_override(ah);



	if (AR_SREV_9565(ah) && ah->shared_chain_lnadiv)

	if (AR_SREV_9565(ah) && common->bt_ant_diversity)

		REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);



	return 0;

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

+0 −1
Original line number Diff line number Diff line
@@ -767,7 +767,6 @@ struct ath_hw { 
	bool aspm_enabled;

	bool is_monitoring;

	bool need_an_top2_fixup;

	bool shared_chain_lnadiv;

	u16 tx_trig_level;



	u32 nf_regs[6];