diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-14 11:40:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-15 13:43:14 -0400 |
commit | 8efa7a813233affeafd9fd7770709e9bda6855b6 (patch) | |
tree | 0c64be3e5cbed0f09bc6141b0a4f32077ee52ace /drivers/net/wireless/ath/ath9k/hw.c | |
parent | ce8fdf6ef6bc2e299d2e1572c55325e0dca7e85f (diff) |
ath9k_hw: remove ath9k_hw_htc_resetinit
Automatically set the ah->htc_reset_init on init and after PHY disable.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 780ecd8aff6e..d3df943ac124 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -449,6 +449,7 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah) | |||
449 | ah->slottime = ATH9K_SLOT_TIME_9; | 449 | ah->slottime = ATH9K_SLOT_TIME_9; |
450 | ah->globaltxtimeout = (u32) -1; | 450 | ah->globaltxtimeout = (u32) -1; |
451 | ah->power_mode = ATH9K_PM_UNDEFINED; | 451 | ah->power_mode = ATH9K_PM_UNDEFINED; |
452 | ah->htc_reset_init = true; | ||
452 | } | 453 | } |
453 | 454 | ||
454 | static int ath9k_hw_init_macaddr(struct ath_hw *ah) | 455 | static int ath9k_hw_init_macaddr(struct ath_hw *ah) |
@@ -2631,6 +2632,7 @@ bool ath9k_hw_phy_disable(struct ath_hw *ah) | |||
2631 | return false; | 2632 | return false; |
2632 | 2633 | ||
2633 | ath9k_hw_init_pll(ah, NULL); | 2634 | ath9k_hw_init_pll(ah, NULL); |
2635 | ah->htc_reset_init = true; | ||
2634 | return true; | 2636 | return true; |
2635 | } | 2637 | } |
2636 | EXPORT_SYMBOL(ath9k_hw_phy_disable); | 2638 | EXPORT_SYMBOL(ath9k_hw_phy_disable); |
@@ -2991,12 +2993,6 @@ EXPORT_SYMBOL(ath_gen_timer_isr); | |||
2991 | /* HTC */ | 2993 | /* HTC */ |
2992 | /********/ | 2994 | /********/ |
2993 | 2995 | ||
2994 | void ath9k_hw_htc_resetinit(struct ath_hw *ah) | ||
2995 | { | ||
2996 | ah->htc_reset_init = true; | ||
2997 | } | ||
2998 | EXPORT_SYMBOL(ath9k_hw_htc_resetinit); | ||
2999 | |||
3000 | static struct { | 2996 | static struct { |
3001 | u32 version; | 2997 | u32 version; |
3002 | const char * name; | 2998 | const char * name; |