aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-io.h
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2007-10-25 05:15:36 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:17 -0500
commitaf7cca2a441f6e2ebeb2a920ef5af1bec8df96e8 (patch)
tree27a2322959e3ee82ae35a58b53c1a392c9736f1e /drivers/net/wireless/iwlwifi/iwl-io.h
parentd860965200c867e7e3e81ede8572cffff8c7eb24 (diff)
iwlwifi: rename restricted_mem to targ_mem
This patch renames restricted_mem suffix with more proper name targ_mem for function accessing memory on the nic in target mode Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-io.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index b78afed9c799..5cdcfc43fa14 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -411,21 +411,20 @@ static inline void iwl_clear_bits_prph(struct iwl_priv
411 _iwl_write_prph(priv, reg, (val & ~mask)); 411 _iwl_write_prph(priv, reg, (val & ~mask));
412} 412}
413 413
414static inline u32 iwl_read_restricted_mem(struct iwl_priv *priv, u32 addr) 414static inline u32 iwl_read_targ_mem(struct iwl_priv *priv, u32 addr)
415{ 415{
416 iwl_write_restricted(priv, HBUS_TARG_MEM_RADDR, addr); 416 iwl_write_restricted(priv, HBUS_TARG_MEM_RADDR, addr);
417 return iwl_read_restricted(priv, HBUS_TARG_MEM_RDAT); 417 return iwl_read_restricted(priv, HBUS_TARG_MEM_RDAT);
418} 418}
419 419
420static inline void iwl_write_restricted_mem(struct iwl_priv *priv, u32 addr, 420static inline void iwl_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val)
421 u32 val)
422{ 421{
423 iwl_write_restricted(priv, HBUS_TARG_MEM_WADDR, addr); 422 iwl_write_restricted(priv, HBUS_TARG_MEM_WADDR, addr);
424 iwl_write_restricted(priv, HBUS_TARG_MEM_WDAT, val); 423 iwl_write_restricted(priv, HBUS_TARG_MEM_WDAT, val);
425} 424}
426 425
427static inline void iwl_write_restricted_mems(struct iwl_priv *priv, u32 addr, 426static inline void iwl_write_targ_mem_buf(struct iwl_priv *priv, u32 addr,
428 u32 len, u32 *values) 427 u32 len, u32 *values)
429{ 428{
430 iwl_write_restricted(priv, HBUS_TARG_MEM_WADDR, addr); 429 iwl_write_restricted(priv, HBUS_TARG_MEM_WADDR, addr);
431 for (; 0 < len; len -= sizeof(u32), values++) 430 for (; 0 < len; len -= sizeof(u32), values++)