Skip to contentSkip to conversation

ath9k: Remove unused ath9k_hw_select_antconfig() from hw.c

PATCH New Vasanthakumar Thiagarajan 1 participant 2 messages Jan 23, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ath9k: Remove unused ath9k_hw_select_antconfig() from hw.c

---
 drivers/net/wireless/ath9k/ath9k.h |    1 -
 drivers/net/wireless/ath9k/hw.c    |   21 ---------------------
 2 files changed, 0 insertions(+), 22 deletions(-)
drivers/net/wireless/ath9k/ath9k.h +0 -1
index 5fcea58..f5d6131 100644
@@ -893,7 +893,6 @@ void ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio, u32 val);
 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
 void ath9k_enable_rfkill(struct ath_hal *ah);
 #endif
-int ath9k_hw_select_antconfig(struct ath_hal *ah, u32 cfg);
 u32 ath9k_hw_getdefantenna(struct ath_hal *ah);
 void ath9k_hw_setantenna(struct ath_hal *ah, u32 antenna);
 bool ath9k_hw_setantennaswitch(struct ath_hal *ah,
drivers/net/wireless/ath9k/hw.c +0 -21
index fae3be6..3c879ac 100644
@@ -3588,27 +3588,6 @@ void ath9k_enable_rfkill(struct ath_hal *ah)
 }
 #endif
 
-int ath9k_hw_select_antconfig(struct ath_hal *ah, u32 cfg)
-{
-	struct ath9k_channel *chan = ah->ah_curchan;
-	const struct ath9k_hw_capabilities *pCap = &ah->ah_caps;
-	u16 ant_config;
-	u32 halNumAntConfig;
-
-	halNumAntConfig = IS_CHAN_2GHZ(chan) ?
-		pCap->num_antcfg_2ghz : pCap->num_antcfg_5ghz;
-
-	if (cfg < halNumAntConfig) {
-		if (!ath9k_hw_get_eeprom_antenna_cfg(ah, chan,
-						     cfg, &ant_config)) {
-			REG_WRITE(ah, AR_PHY_SWITCH_COM, ant_config);
-			return 0;
-		}
-	}
-
-	return -EINVAL;
-}
-
 u32 ath9k_hw_getdefantenna(struct ath_hal *ah)
 {
 	return REG_READ(ah, AR_DEF_ANTENNA) & 0x7;
Signature · 1 line
1.5.5.1
#1 lore raw

PATCH 2/2 ath9k: Clean up the way the eeprom antenna configuration is read

---
 drivers/net/wireless/ath9k/ath9k.h  |    5 +--
 drivers/net/wireless/ath9k/eeprom.c |   63 ++++++++--------------------------
 2 files changed, 17 insertions(+), 51 deletions(-)
drivers/net/wireless/ath9k/ath9k.h +2 -3
index f5d6131..c28d7dc 100644
@@ -992,9 +992,8 @@ bool ath9k_hw_set_power_cal_table(struct ath_hal *ah,
 				  int16_t *pTxPowerIndexOffset);
 bool ath9k_hw_eeprom_set_board_values(struct ath_hal *ah,
 				      struct ath9k_channel *chan);
-int ath9k_hw_get_eeprom_antenna_cfg(struct ath_hal *ah,
-				    struct ath9k_channel *chan,
-				    u8 index, u16 *config);
+u16 ath9k_hw_get_eeprom_antenna_cfg(struct ath_hal *ah,
+				    struct ath9k_channel *chan);
 u8 ath9k_hw_get_num_ant_config(struct ath_hal *ah,
 			       enum ieee80211_band freq_band);
 u16 ath9k_hw_eeprom_get_spur_chan(struct ath_hal *ah, u16 i, bool is2GHz);
drivers/net/wireless/ath9k/eeprom.c +15 -48

114 lines not on this page · raw message

Signature · 1 line
1.5.5.1