diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-08-04 04:52:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-05 14:52:44 -0400 |
commit | 7bdea96a1bbae75e7922584e3ae37fb9ad6cb79a (patch) | |
tree | c768dedfa37a17a35ff0de5f15384ff1a20d418c /drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |
parent | d7150908248bc76eff48c16045802c7f0b1cfd74 (diff) |
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: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_eeprom.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index a98e6a3dd8a1..c2f1f18e364b 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -3561,6 +3561,7 @@ static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain, | |||
3561 | 3561 | ||
3562 | static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) | 3562 | static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) |
3563 | { | 3563 | { |
3564 | struct ath_common *common = ath9k_hw_common(ah); | ||
3564 | struct ath9k_hw_capabilities *pCap = &ah->caps; | 3565 | struct ath9k_hw_capabilities *pCap = &ah->caps; |
3565 | int chain; | 3566 | int chain; |
3566 | u32 regval, value, gpio; | 3567 | u32 regval, value, gpio; |
@@ -3646,7 +3647,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) | |||
3646 | regval |= ((value >> 6) & 0x1) << AR_PHY_ANT_DIV_LNADIV_S; | 3647 | regval |= ((value >> 6) & 0x1) << AR_PHY_ANT_DIV_LNADIV_S; |
3647 | 3648 | ||
3648 | if (AR_SREV_9565(ah)) { | 3649 | if (AR_SREV_9565(ah)) { |
3649 | if (ah->shared_chain_lnadiv) { | 3650 | if (common->bt_ant_diversity) { |
3650 | regval |= (1 << AR_PHY_ANT_SW_RX_PROT_S); | 3651 | regval |= (1 << AR_PHY_ANT_SW_RX_PROT_S); |
3651 | } else { | 3652 | } else { |
3652 | regval &= ~(1 << AR_PHY_ANT_DIV_LNADIV_S); | 3653 | regval &= ~(1 << AR_PHY_ANT_DIV_LNADIV_S); |