Commit 8efa7a81 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: remove ath9k_hw_htc_resetinit 



Automatically set the ah->htc_reset_init on init and after PHY disable.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ce8fdf6e

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -919,7 +919,6 @@ static int ath9k_htc_start(struct ieee80211_hw *hw) 
	/* setup initial channel */

	/* setup initial channel */

	init_channel = ath9k_cmn_get_curchannel(hw, ah);

	init_channel = ath9k_cmn_get_curchannel(hw, ah);





	ath9k_hw_htc_resetinit(ah);

	ret = ath9k_hw_reset(ah, init_channel, ah->caldata, false);

	ret = ath9k_hw_reset(ah, init_channel, ah->caldata, false);

	if (ret) {

	if (ret) {

		ath_err(common,

		ath_err(common,

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -449,6 +449,7 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah) 
	ah->slottime = ATH9K_SLOT_TIME_9;

	ah->slottime = ATH9K_SLOT_TIME_9;

	ah->globaltxtimeout = (u32) -1;

	ah->globaltxtimeout = (u32) -1;

	ah->power_mode = ATH9K_PM_UNDEFINED;

	ah->power_mode = ATH9K_PM_UNDEFINED;

	ah->htc_reset_init = true;

}

}





static int ath9k_hw_init_macaddr(struct ath_hw *ah)

static int ath9k_hw_init_macaddr(struct ath_hw *ah)
@@ -2631,6 +2632,7 @@ bool ath9k_hw_phy_disable(struct ath_hw *ah) 
		return false;

		return false;





	ath9k_hw_init_pll(ah, NULL);

	ath9k_hw_init_pll(ah, NULL);

	ah->htc_reset_init = true;

	return true;

	return true;

}

}

EXPORT_SYMBOL(ath9k_hw_phy_disable);

EXPORT_SYMBOL(ath9k_hw_phy_disable);
@@ -2991,12 +2993,6 @@ EXPORT_SYMBOL(ath_gen_timer_isr); 
/* HTC  */

/* HTC  */

/********/

/********/





void ath9k_hw_htc_resetinit(struct ath_hw *ah)

{

	ah->htc_reset_init = true;

}

EXPORT_SYMBOL(ath9k_hw_htc_resetinit);



static struct {

static struct {

	u32 version;

	u32 version;

	const char * name;

	const char * name;

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -988,9 +988,6 @@ void ath_gen_timer_isr(struct ath_hw *hw); 




void ath9k_hw_name(struct ath_hw *ah, char *hw_name, size_t len);

void ath9k_hw_name(struct ath_hw *ah, char *hw_name, size_t len);





/* HTC */

void ath9k_hw_htc_resetinit(struct ath_hw *ah);



/* PHY */

/* PHY */

void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,

void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,

				   u32 *coef_mantissa, u32 *coef_exponent);

				   u32 *coef_mantissa, u32 *coef_exponent);