diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-14 11:40:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-15 13:45:02 -0400 |
commit | 99ac8cd6ff44e733acdff0d36475dce2d3fe6a6b (patch) | |
tree | b0dde64ad9f644cdf80600b77a86c42fffb6ee92 /drivers/net/wireless | |
parent | 8efa7a813233affeafd9fd7770709e9bda6855b6 (diff) |
ath9k_hw: remove ath9k_hw_getdefantenna
The default antenna (as programmed by the INI file) is always 0 anyway.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index d3df943ac124..b92cf01cfd19 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -2569,12 +2569,6 @@ void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val) | |||
2569 | } | 2569 | } |
2570 | EXPORT_SYMBOL(ath9k_hw_set_gpio); | 2570 | EXPORT_SYMBOL(ath9k_hw_set_gpio); |
2571 | 2571 | ||
2572 | u32 ath9k_hw_getdefantenna(struct ath_hw *ah) | ||
2573 | { | ||
2574 | return REG_READ(ah, AR_DEF_ANTENNA) & 0x7; | ||
2575 | } | ||
2576 | EXPORT_SYMBOL(ath9k_hw_getdefantenna); | ||
2577 | |||
2578 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna) | 2572 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna) |
2579 | { | 2573 | { |
2580 | REG_WRITE(ah, AR_DEF_ANTENNA, (antenna & 0x7)); | 2574 | REG_WRITE(ah, AR_DEF_ANTENNA, (antenna & 0x7)); |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 7ce60fb1d91e..5036f95c48c1 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -934,7 +934,6 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio); | |||
934 | void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio, | 934 | void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio, |
935 | u32 ah_signal_type); | 935 | u32 ah_signal_type); |
936 | void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val); | 936 | void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val); |
937 | u32 ath9k_hw_getdefantenna(struct ath_hw *ah); | ||
938 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna); | 937 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna); |
939 | 938 | ||
940 | /* General Operation */ | 939 | /* General Operation */ |
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 2708d1fc2c10..8cb37429b216 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -488,7 +488,6 @@ static void ath9k_init_misc(struct ath_softc *sc) | |||
488 | setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc); | 488 | setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc); |
489 | 489 | ||
490 | sc->config.txpowlimit = ATH_TXPOWER_MAX; | 490 | sc->config.txpowlimit = ATH_TXPOWER_MAX; |
491 | sc->rx.defant = ath9k_hw_getdefantenna(sc->sc_ah); | ||
492 | memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); | 491 | memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); |
493 | sc->beacon.slottime = ATH9K_SLOT_TIME_9; | 492 | sc->beacon.slottime = ATH9K_SLOT_TIME_9; |
494 | 493 | ||