diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-08-04 04:51:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-05 14:52:42 -0400 |
commit | d8d7744b72b56587b39fb4ecc2cbfb3d8cb734a4 (patch) | |
tree | 1473e9ee19f8ba5606509fcb4c6c2f31448e480a /drivers/net | |
parent | 3f2da95517029d88365a074ef81a928a99871964 (diff) |
ath9k: Rename ath9k_hw_antctrl_shared_chain_lnadiv
Use "ath9k_hw_set_bt_ant_diversity" instead.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/antenna.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw-ops.h | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/antenna.c b/drivers/net/wireless/ath/ath9k/antenna.c index 354dc668205e..85391e690931 100644 --- a/drivers/net/wireless/ath/ath9k/antenna.c +++ b/drivers/net/wireless/ath/ath9k/antenna.c | |||
@@ -888,5 +888,5 @@ void ath_ant_comb_update(struct ath_softc *sc) | |||
888 | ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf); | 888 | ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf); |
889 | 889 | ||
890 | if (common->bt_ant_diversity) | 890 | if (common->bt_ant_diversity) |
891 | ath9k_hw_antctrl_shared_chain_lnadiv(ah, true); | 891 | ath9k_hw_set_bt_ant_diversity(ah, true); |
892 | } | 892 | } |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 3ec33ce7be66..f9fe9c81268f 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c | |||
@@ -1412,8 +1412,7 @@ static void ar9003_hw_antdiv_comb_conf_set(struct ath_hw *ah, | |||
1412 | REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval); | 1412 | REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval); |
1413 | } | 1413 | } |
1414 | 1414 | ||
1415 | static void ar9003_hw_antctrl_shared_chain_lnadiv(struct ath_hw *ah, | 1415 | static void ar9003_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable) |
1416 | bool enable) | ||
1417 | { | 1416 | { |
1418 | u8 ant_div_ctl1; | 1417 | u8 ant_div_ctl1; |
1419 | u32 regval; | 1418 | u32 regval; |
@@ -1646,7 +1645,7 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah) | |||
1646 | 1645 | ||
1647 | ops->antdiv_comb_conf_get = ar9003_hw_antdiv_comb_conf_get; | 1646 | ops->antdiv_comb_conf_get = ar9003_hw_antdiv_comb_conf_get; |
1648 | ops->antdiv_comb_conf_set = ar9003_hw_antdiv_comb_conf_set; | 1647 | ops->antdiv_comb_conf_set = ar9003_hw_antdiv_comb_conf_set; |
1649 | ops->antctrl_shared_chain_lnadiv = ar9003_hw_antctrl_shared_chain_lnadiv; | 1648 | ops->set_bt_ant_diversity = ar9003_hw_set_bt_ant_diversity; |
1650 | ops->spectral_scan_config = ar9003_hw_spectral_scan_config; | 1649 | ops->spectral_scan_config = ar9003_hw_spectral_scan_config; |
1651 | ops->spectral_scan_trigger = ar9003_hw_spectral_scan_trigger; | 1650 | ops->spectral_scan_trigger = ar9003_hw_spectral_scan_trigger; |
1652 | ops->spectral_scan_wait = ar9003_hw_spectral_scan_wait; | 1651 | ops->spectral_scan_wait = ar9003_hw_spectral_scan_wait; |
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h index 14b701140b49..a78d48c3ad21 100644 --- a/drivers/net/wireless/ath/ath9k/hw-ops.h +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h | |||
@@ -78,11 +78,10 @@ static inline void ath9k_hw_antdiv_comb_conf_set(struct ath_hw *ah, | |||
78 | ath9k_hw_ops(ah)->antdiv_comb_conf_set(ah, antconf); | 78 | ath9k_hw_ops(ah)->antdiv_comb_conf_set(ah, antconf); |
79 | } | 79 | } |
80 | 80 | ||
81 | static inline void ath9k_hw_antctrl_shared_chain_lnadiv(struct ath_hw *ah, | 81 | static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable) |
82 | bool enable) | ||
83 | { | 82 | { |
84 | if (ath9k_hw_ops(ah)->antctrl_shared_chain_lnadiv) | 83 | if (ath9k_hw_ops(ah)->set_bt_ant_diversity) |
85 | ath9k_hw_ops(ah)->antctrl_shared_chain_lnadiv(ah, enable); | 84 | ath9k_hw_ops(ah)->set_bt_ant_diversity(ah, enable); |
86 | } | 85 | } |
87 | 86 | ||
88 | /* Private hardware call ops */ | 87 | /* Private hardware call ops */ |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 4ab8f58c7287..c037718cf6e3 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -718,7 +718,7 @@ struct ath_hw_ops { | |||
718 | struct ath_hw_antcomb_conf *antconf); | 718 | struct ath_hw_antcomb_conf *antconf); |
719 | void (*antdiv_comb_conf_set)(struct ath_hw *ah, | 719 | void (*antdiv_comb_conf_set)(struct ath_hw *ah, |
720 | struct ath_hw_antcomb_conf *antconf); | 720 | struct ath_hw_antcomb_conf *antconf); |
721 | void (*antctrl_shared_chain_lnadiv)(struct ath_hw *hw, bool enable); | 721 | void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable); |
722 | void (*spectral_scan_config)(struct ath_hw *ah, | 722 | void (*spectral_scan_config)(struct ath_hw *ah, |
723 | struct ath_spec_scan *param); | 723 | struct ath_spec_scan *param); |
724 | void (*spectral_scan_trigger)(struct ath_hw *ah); | 724 | void (*spectral_scan_trigger)(struct ath_hw *ah); |