diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-03-14 19:40:29 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-15 21:45:06 +0400 |
| commit | c8664d13a58f7cccc673c0840efcc698f7872172 (patch) | |
| tree | 048f571513be4d623922b32be9de5c3fbe332e0e | |
| parent | bbf2b30c0ee0860ab10af856f7d8570c8652d9fd (diff) | |
| download | linux-c8664d13a58f7cccc673c0840efcc698f7872172.tar.xz | |
ath9k_hw: fold ar9002_hw_cck_chan14_spread into mode regs initialization
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9002_hw.c | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c index 2829c8c75e86..1d06dab27030 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c @@ -154,11 +154,6 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah) INI_RA(addac, 31,1) = 0; } } -} - -/* Support for Japan ch.14 (2484) spread */ -void ar9002_hw_cck_chan14_spread(struct ath_hw *ah) -{ if (AR_SREV_9287_11_OR_LATER(ah)) { INIT_INI_ARRAY(&ah->iniCckfirNormal, ar9287Common_normal_cck_fir_coeff_9287_1_1, diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index ce9577ebaf2b..3022c4e4d103 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -620,9 +620,6 @@ static int __ath9k_hw_init(struct ath_hw *ah) if (!ah->is_pciexpress) ath9k_hw_disablepcie(ah); - if (!AR_SREV_9300_20_OR_LATER(ah)) - ar9002_hw_cck_chan14_spread(ah); - r = ath9k_hw_post_init(ah); if (r) return r; diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 043df3cf54fe..4bd2c89654d4 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -994,7 +994,6 @@ void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan); * Code Specific to AR5008, AR9001 or AR9002, * we stuff these here to avoid callbacks for AR9003. */ -void ar9002_hw_cck_chan14_spread(struct ath_hw *ah); int ar9002_hw_rf_claim(struct ath_hw *ah); void ar9002_hw_enable_async_fifo(struct ath_hw *ah); |