diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-03-12 23:26:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-27 20:12:49 -0400 |
commit | 355363fcf7daded4a48308b54d6b86bea4f8bb6d (patch) | |
tree | 1324e7b2ebaa29dcfcf4dec183f59731877b5a82 /drivers/net/wireless/ath9k/eeprom.c | |
parent | 7d01b221b338ef2a5b1ffa9c60645c0bdcce191e (diff) |
ath9k: Move AR5416_VER_MASK to a common location
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/eeprom.c')
-rw-r--r-- | drivers/net/wireless/ath9k/eeprom.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath9k/eeprom.c b/drivers/net/wireless/ath9k/eeprom.c index 6c9bc5fdb04a..49dee238c683 100644 --- a/drivers/net/wireless/ath9k/eeprom.c +++ b/drivers/net/wireless/ath9k/eeprom.c | |||
@@ -1588,7 +1588,6 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah) | |||
1588 | static u32 ath9k_hw_def_get_eeprom(struct ath_hw *ah, | 1588 | static u32 ath9k_hw_def_get_eeprom(struct ath_hw *ah, |
1589 | enum eeprom_param param) | 1589 | enum eeprom_param param) |
1590 | { | 1590 | { |
1591 | #define AR5416_VER_MASK (pBase->version & AR5416_EEP_VER_MINOR_MASK) | ||
1592 | struct ar5416_eeprom_def *eep = &ah->eeprom.def; | 1591 | struct ar5416_eeprom_def *eep = &ah->eeprom.def; |
1593 | struct modal_eep_header *pModal = eep->modalHeader; | 1592 | struct modal_eep_header *pModal = eep->modalHeader; |
1594 | struct base_eep_header *pBase = &eep->baseEepHeader; | 1593 | struct base_eep_header *pBase = &eep->baseEepHeader; |
@@ -1655,14 +1654,12 @@ static u32 ath9k_hw_def_get_eeprom(struct ath_hw *ah, | |||
1655 | default: | 1654 | default: |
1656 | return 0; | 1655 | return 0; |
1657 | } | 1656 | } |
1658 | #undef AR5416_VER_MASK | ||
1659 | } | 1657 | } |
1660 | 1658 | ||
1661 | /* XXX: Clean me up, make me more legible */ | 1659 | /* XXX: Clean me up, make me more legible */ |
1662 | static bool ath9k_hw_def_set_board_values(struct ath_hw *ah, | 1660 | static bool ath9k_hw_def_set_board_values(struct ath_hw *ah, |
1663 | struct ath9k_channel *chan) | 1661 | struct ath9k_channel *chan) |
1664 | { | 1662 | { |
1665 | #define AR5416_VER_MASK (eep->baseEepHeader.version & AR5416_EEP_VER_MINOR_MASK) | ||
1666 | struct modal_eep_header *pModal; | 1663 | struct modal_eep_header *pModal; |
1667 | struct ar5416_eeprom_def *eep = &ah->eeprom.def; | 1664 | struct ar5416_eeprom_def *eep = &ah->eeprom.def; |
1668 | int i, regChainOffset; | 1665 | int i, regChainOffset; |
@@ -1910,7 +1907,6 @@ static bool ath9k_hw_def_set_board_values(struct ath_hw *ah, | |||
1910 | } | 1907 | } |
1911 | 1908 | ||
1912 | return true; | 1909 | return true; |
1913 | #undef AR5416_VER_MASK | ||
1914 | } | 1910 | } |
1915 | 1911 | ||
1916 | static void ath9k_hw_def_set_addac(struct ath_hw *ah, | 1912 | static void ath9k_hw_def_set_addac(struct ath_hw *ah, |