diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-04-13 06:14:43 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-22 13:02:19 -0400 |
commit | e46f6538c24f01bb68dc374358ce85a0af666682 (patch) | |
tree | 6d579e24d715096e9553557abcb1f90ffc7d8365 /drivers/net/wireless/iwlwifi/iwl-io.h | |
parent | 73b48099cc265f88fa1255f3f43e52fe6a94fd5c (diff) |
iwlagn: simplify error table reading
The current code to read the error table header
just hardcodes all the offsets, which is a bit
hard to understand. We can read in the entire
header (as much as we need) into a structure,
and then take the data from there, which makes
it easier to understand. To read a bigger blob
we also don't need to grab NIC access for each
word read, making the code more efficient.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-io.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h index ab632baf49d5..262e0262496d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-io.h | |||
@@ -76,6 +76,16 @@ void iwl_set_bits_mask_prph(struct iwl_priv *priv, u32 reg, | |||
76 | u32 bits, u32 mask); | 76 | u32 bits, u32 mask); |
77 | void iwl_clear_bits_prph(struct iwl_priv *priv, u32 reg, u32 mask); | 77 | void iwl_clear_bits_prph(struct iwl_priv *priv, u32 reg, u32 mask); |
78 | 78 | ||
79 | void _iwl_read_targ_mem_words(struct iwl_priv *priv, u32 addr, | ||
80 | void *buf, int words); | ||
81 | |||
82 | #define iwl_read_targ_mem_words(priv, addr, buf, bufsize) \ | ||
83 | do { \ | ||
84 | BUILD_BUG_ON((bufsize) % sizeof(u32)); \ | ||
85 | _iwl_read_targ_mem_words(priv, addr, buf, \ | ||
86 | (bufsize) / sizeof(u32));\ | ||
87 | } while (0) | ||
88 | |||
79 | u32 iwl_read_targ_mem(struct iwl_priv *priv, u32 addr); | 89 | u32 iwl_read_targ_mem(struct iwl_priv *priv, u32 addr); |
80 | void iwl_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val); | 90 | void iwl_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val); |
81 | #endif | 91 | #endif |