diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2009-01-23 04:10:36 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:01:24 -0500 |
commit | 3aa24e6031a0ca7a8803a103f5c183cd94e5ac98 (patch) | |
tree | e7326eee3bbab27a065d5a1b656df1adbf2f4eb0 /drivers/net/wireless | |
parent | 5dad40c13e7753e7b62eb7c2fca9b4034679882a (diff) |
ath9k: Remove unused ath9k_hw_select_antconfig() from hw.c
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath9k/ath9k.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/hw.c | 21 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h index f44aab50a2d6..455a53649b32 100644 --- a/drivers/net/wireless/ath9k/ath9k.h +++ b/drivers/net/wireless/ath9k/ath9k.h | |||
@@ -874,7 +874,6 @@ void ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio, u32 val); | |||
874 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) | 874 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) |
875 | void ath9k_enable_rfkill(struct ath_hal *ah); | 875 | void ath9k_enable_rfkill(struct ath_hal *ah); |
876 | #endif | 876 | #endif |
877 | int ath9k_hw_select_antconfig(struct ath_hal *ah, u32 cfg); | ||
878 | u32 ath9k_hw_getdefantenna(struct ath_hal *ah); | 877 | u32 ath9k_hw_getdefantenna(struct ath_hal *ah); |
879 | void ath9k_hw_setantenna(struct ath_hal *ah, u32 antenna); | 878 | void ath9k_hw_setantenna(struct ath_hal *ah, u32 antenna); |
880 | bool ath9k_hw_setantennaswitch(struct ath_hal *ah, | 879 | bool ath9k_hw_setantennaswitch(struct ath_hal *ah, |
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index 1a49743151ba..bb8628c7efa1 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c | |||
@@ -3542,27 +3542,6 @@ void ath9k_enable_rfkill(struct ath_hal *ah) | |||
3542 | } | 3542 | } |
3543 | #endif | 3543 | #endif |
3544 | 3544 | ||
3545 | int ath9k_hw_select_antconfig(struct ath_hal *ah, u32 cfg) | ||
3546 | { | ||
3547 | struct ath9k_channel *chan = ah->ah_curchan; | ||
3548 | const struct ath9k_hw_capabilities *pCap = &ah->ah_caps; | ||
3549 | u16 ant_config; | ||
3550 | u32 halNumAntConfig; | ||
3551 | |||
3552 | halNumAntConfig = IS_CHAN_2GHZ(chan) ? | ||
3553 | pCap->num_antcfg_2ghz : pCap->num_antcfg_5ghz; | ||
3554 | |||
3555 | if (cfg < halNumAntConfig) { | ||
3556 | if (!ath9k_hw_get_eeprom_antenna_cfg(ah, chan, | ||
3557 | cfg, &ant_config)) { | ||
3558 | REG_WRITE(ah, AR_PHY_SWITCH_COM, ant_config); | ||
3559 | return 0; | ||
3560 | } | ||
3561 | } | ||
3562 | |||
3563 | return -EINVAL; | ||
3564 | } | ||
3565 | |||
3566 | u32 ath9k_hw_getdefantenna(struct ath_hal *ah) | 3545 | u32 ath9k_hw_getdefantenna(struct ath_hal *ah) |
3567 | { | 3546 | { |
3568 | return REG_READ(ah, AR_DEF_ANTENNA) & 0x7; | 3547 | return REG_READ(ah, AR_DEF_ANTENNA) & 0x7; |