diff options
author | Bruno Randolf <br1@einfach.org> | 2010-03-09 02:55:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-03-10 17:44:34 -0500 |
commit | ff5d96ce622271df430c715ebe3e0b7400059dc1 (patch) | |
tree | 33eea44be9610f115202653bc3bdfea19f4a2742 /drivers/net/wireless/ath | |
parent | ccfe5552aeb18c87a4d0ecb8cb7512280435bfdd (diff) |
ath5k: remove ah_magic
it's never used. probably a leftover from the old OpenHAL days...
Signed-off-by: Bruno Randolf <br1@einfach.org>
Acked-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/ath5k.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/desc.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/eeprom.h | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h index e5ace22b951e..2c3b4a65752c 100644 --- a/drivers/net/wireless/ath/ath5k/ath5k.h +++ b/drivers/net/wireless/ath/ath5k/ath5k.h | |||
@@ -1028,7 +1028,6 @@ struct ath5k_nfcal_hist | |||
1028 | 1028 | ||
1029 | /* TODO: Clean up and merge with ath5k_softc */ | 1029 | /* TODO: Clean up and merge with ath5k_softc */ |
1030 | struct ath5k_hw { | 1030 | struct ath5k_hw { |
1031 | u32 ah_magic; | ||
1032 | struct ath_common common; | 1031 | struct ath_common common; |
1033 | 1032 | ||
1034 | struct ath5k_softc *ah_sc; | 1033 | struct ath5k_softc *ah_sc; |
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c index d26126bfacdd..aebb31f2834b 100644 --- a/drivers/net/wireless/ath/ath5k/desc.c +++ b/drivers/net/wireless/ath/ath5k/desc.c | |||
@@ -670,12 +670,6 @@ int ath5k_hw_init_desc_functions(struct ath5k_hw *ah) | |||
670 | ah->ah_version != AR5K_AR5212) | 670 | ah->ah_version != AR5K_AR5212) |
671 | return -ENOTSUPP; | 671 | return -ENOTSUPP; |
672 | 672 | ||
673 | /* XXX: What is this magic value and where is it used ? */ | ||
674 | if (ah->ah_version == AR5K_AR5212) | ||
675 | ah->ah_magic = AR5K_EEPROM_MAGIC_5212; | ||
676 | else if (ah->ah_version == AR5K_AR5211) | ||
677 | ah->ah_magic = AR5K_EEPROM_MAGIC_5211; | ||
678 | |||
679 | if (ah->ah_version == AR5K_AR5212) { | 673 | if (ah->ah_version == AR5K_AR5212) { |
680 | ah->ah_setup_rx_desc = ath5k_hw_setup_rx_desc; | 674 | ah->ah_setup_rx_desc = ath5k_hw_setup_rx_desc; |
681 | ah->ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc; | 675 | ah->ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc; |
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.h b/drivers/net/wireless/ath/ath5k/eeprom.h index 473a483bb9c3..1a65683e8c16 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.h +++ b/drivers/net/wireless/ath/ath5k/eeprom.h | |||
@@ -24,9 +24,6 @@ | |||
24 | * SERDES infos are present */ | 24 | * SERDES infos are present */ |
25 | #define AR5K_EEPROM_MAGIC 0x003d /* EEPROM Magic number */ | 25 | #define AR5K_EEPROM_MAGIC 0x003d /* EEPROM Magic number */ |
26 | #define AR5K_EEPROM_MAGIC_VALUE 0x5aa5 /* Default - found on EEPROM */ | 26 | #define AR5K_EEPROM_MAGIC_VALUE 0x5aa5 /* Default - found on EEPROM */ |
27 | #define AR5K_EEPROM_MAGIC_5212 0x0000145c /* 5212 */ | ||
28 | #define AR5K_EEPROM_MAGIC_5211 0x0000145b /* 5211 */ | ||
29 | #define AR5K_EEPROM_MAGIC_5210 0x0000145a /* 5210 */ | ||
30 | 27 | ||
31 | #define AR5K_EEPROM_IS_HB63 0x000b /* Talon detect */ | 28 | #define AR5K_EEPROM_IS_HB63 0x000b /* Talon detect */ |
32 | 29 | ||