aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/hw.h
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2010-03-31 18:05:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-06 16:55:08 -0400
commit152d530d9edbb08424dc1b6561252597a7932c49 (patch)
tree2fd5f34a59e76a11bd683cf5dcd925ac09f90533 /drivers/net/wireless/ath/ath9k/hw.h
parent3069168c82d65f88e4ac76eda09baff02adfd743 (diff)
ath9k: remove ah->mask_reg, it's never used properly
ah->mask_reg was used to hold different data throughout the driver. ath9k_hw_init_interrupt_masks() used it to save the value written to AR_IMR. ath9k_hw_set_interrupts() used it to hold the interrupt mask as defined in enum ath9k_int. Those masks differ in many bits. Use ah->imask instead of ah->mask_reg in ath9k_hw_set_interrupts() and ath9k_hw_updatetxtriglevel(). That's what the code was meant to do. ah->imask is initialized in ath9k_start(), so we don't need to initialize it from ah->mask_reg. Once it's done, ah->mask_reg becomes write-only, so it's replaced with a local variable in ath9k_hw_init_interrupt_masks(). Signed-off-by: Pavel Roskin <proski@gnu.org> Reported-by: Julia Lawall <julia@diku.dk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 0ac7a80be082..97ebeba8a157 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -479,7 +479,6 @@ struct ath_hw {
479 479
480 int16_t curchan_rad_index; 480 int16_t curchan_rad_index;
481 enum ath9k_int imask; 481 enum ath9k_int imask;
482 u32 mask_reg;
483 u32 imrs2_reg; 482 u32 imrs2_reg;
484 u32 txok_interrupt_mask; 483 u32 txok_interrupt_mask;
485 u32 txerr_interrupt_mask; 484 u32 txerr_interrupt_mask;