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

ath9k: Rename ath9k_hw_antctrl_shared_chain_lnadiv 



Use "ath9k_hw_set_bt_ant_diversity" instead.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -888,5 +888,5 @@ void ath_ant_comb_update(struct ath_softc *sc) 
	ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf);



	if (common->bt_ant_diversity)

		ath9k_hw_antctrl_shared_chain_lnadiv(ah, true);

		ath9k_hw_set_bt_ant_diversity(ah, true);

}

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

+2 −3
Original line number Diff line number Diff line
@@ -1412,8 +1412,7 @@ static void ar9003_hw_antdiv_comb_conf_set(struct ath_hw *ah, 
	REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);

}



static void ar9003_hw_antctrl_shared_chain_lnadiv(struct ath_hw *ah,

						  bool enable)

static void ar9003_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)

{

	u8 ant_div_ctl1;

	u32 regval;
@@ -1646,7 +1645,7 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah) 


	ops->antdiv_comb_conf_get = ar9003_hw_antdiv_comb_conf_get;

	ops->antdiv_comb_conf_set = ar9003_hw_antdiv_comb_conf_set;

	ops->antctrl_shared_chain_lnadiv = ar9003_hw_antctrl_shared_chain_lnadiv;

	ops->set_bt_ant_diversity = ar9003_hw_set_bt_ant_diversity;

	ops->spectral_scan_config = ar9003_hw_spectral_scan_config;

	ops->spectral_scan_trigger = ar9003_hw_spectral_scan_trigger;

	ops->spectral_scan_wait = ar9003_hw_spectral_scan_wait;

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

+3 −4
Original line number Diff line number Diff line
@@ -78,11 +78,10 @@ static inline void ath9k_hw_antdiv_comb_conf_set(struct ath_hw *ah, 
	ath9k_hw_ops(ah)->antdiv_comb_conf_set(ah, antconf);

}



static inline void ath9k_hw_antctrl_shared_chain_lnadiv(struct ath_hw *ah,

							bool enable)

static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)

{

	if (ath9k_hw_ops(ah)->antctrl_shared_chain_lnadiv)

		ath9k_hw_ops(ah)->antctrl_shared_chain_lnadiv(ah, enable);

	if (ath9k_hw_ops(ah)->set_bt_ant_diversity)

		ath9k_hw_ops(ah)->set_bt_ant_diversity(ah, enable);

}



/* Private hardware call ops */

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

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ struct ath_hw_ops { 
			struct ath_hw_antcomb_conf *antconf);

	void (*antdiv_comb_conf_set)(struct ath_hw *ah,

			struct ath_hw_antcomb_conf *antconf);

	void (*antctrl_shared_chain_lnadiv)(struct ath_hw *hw, bool enable);

	void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);

	void (*spectral_scan_config)(struct ath_hw *ah,

				     struct ath_spec_scan *param);

	void (*spectral_scan_trigger)(struct ath_hw *ah);