lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k: Remove redundant variable for Interrupt Mitigation

Browse Source 
The state is already stored in ath9k_ops_config, so remove
the duplicate variable in ath_hw.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith
2009-03-30 15:28:35 +05:30
committed by John W. Linville
parent eef7a57430
commit 0ef1f168b6
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/wireless/ath9k/hw.c
View File

@@ -380,7 +380,7 @@ static void ath9k_hw_set_defaults(struct ath_hw *ah)
ah->config.spurchans[i][1] = AR_NO_SPUR; ah->config.spurchans[i][1] = AR_NO_SPUR;
} }
ah->config.intr_mitigation = 1; ah->config.intr_mitigation = true;
/* /*
* We need this for PCI devices only (Cardbus, PCI, miniPCI) * We need this for PCI devices only (Cardbus, PCI, miniPCI)
@@ -599,9 +599,6 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
ath9k_hw_set_defaults(ah); ath9k_hw_set_defaults(ah);
if (ah->config.intr_mitigation != 0)
ah->intr_mitigation = true;
if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) { if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
DPRINTF(sc, ATH_DBG_FATAL, "Couldn't reset chip\n"); DPRINTF(sc, ATH_DBG_FATAL, "Couldn't reset chip\n");
ecode = -EIO; ecode = -EIO;
@@ -1028,7 +1025,7 @@ static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,
AR_IMR_RXORN | AR_IMR_RXORN |
AR_IMR_BCNMISC; AR_IMR_BCNMISC;
if (ah->intr_mitigation) if (ah->config.intr_mitigation)
ah->mask_reg |= AR_IMR_RXINTM | AR_IMR_RXMINTR; ah->mask_reg |= AR_IMR_RXINTM | AR_IMR_RXMINTR;
else else
ah->mask_reg |= AR_IMR_RXOK; ah->mask_reg |= AR_IMR_RXOK;
@@ -2301,8 +2298,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
REG_WRITE(ah, AR_OBS, 8); REG_WRITE(ah, AR_OBS, 8);
if (ah->intr_mitigation) { if (ah->config.intr_mitigation) {
REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500); REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 2000); REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 2000);
} }
@@ -2908,7 +2904,7 @@ bool ath9k_hw_getisr(struct ath_hw *ah, enum ath9k_int *masked)
*masked = isr & ATH9K_INT_COMMON; *masked = isr & ATH9K_INT_COMMON;
if (ah->intr_mitigation) { if (ah->config.intr_mitigation) {
if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM)) if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM))
*masked |= ATH9K_INT_RX; *masked |= ATH9K_INT_RX;
} }
@@ -3026,7 +3022,7 @@ enum ath9k_int ath9k_hw_set_interrupts(struct ath_hw *ah, enum ath9k_int ints)
} }
if (ints & ATH9K_INT_RX) { if (ints & ATH9K_INT_RX) {
mask |= AR_IMR_RXERR; mask |= AR_IMR_RXERR;
if (ah->intr_mitigation) if (ah->config.intr_mitigation)
mask |= AR_IMR_RXMINTR | AR_IMR_RXINTM; mask |= AR_IMR_RXMINTR | AR_IMR_RXINTM;
else else
mask |= AR_IMR_RXOK | AR_IMR_RXDESC; mask |= AR_IMR_RXOK | AR_IMR_RXDESC;

3
drivers/net/wireless/ath9k/hw.h
View File

@@ -190,7 +190,7 @@ struct ath9k_ops_config {
u16 diversity_control; u16 diversity_control;
u16 antenna_switch_swap; u16 antenna_switch_swap;
int serialize_regmode; int serialize_regmode;
int intr_mitigation; bool intr_mitigation;
#define SPUR_DISABLE 0 #define SPUR_DISABLE 0
#define SPUR_ENABLE_IOCTL 1 #define SPUR_ENABLE_IOCTL 1
#define SPUR_ENABLE_EEPROM 2 #define SPUR_ENABLE_EEPROM 2
@@ -524,7 +524,6 @@ struct ath_hw {
enum ath9k_ani_cmd ani_function; enum ath9k_ani_cmd ani_function;
u32 intr_txqs; u32 intr_txqs;
bool intr_mitigation;
enum ath9k_ht_extprotspacing extprotspacing; enum ath9k_ht_extprotspacing extprotspacing;
u8 txchainmask; u8 txchainmask;
u8 rxchainmask; u8 rxchainmask;