diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-06-06 01:18:40 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-13 03:01:01 -0400 |
commit | e4b1681eafa62e2b34710f70ab3494c89cc03130 (patch) | |
tree | e4ffe9b33e5ea3e9dfd4c409728a382fe5f599a9 /drivers/net/wireless/iwlwifi/iwl-io.c | |
parent | 7eb89baa261ea8f09d7f6ad3c4db270fd7f3d0bd (diff) |
iwlwifi: iwl_{read,write}_targ_mem_words takes dwords
Change its name to better reflect this.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-io.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c index 5f2df70b73c1..66c873399aba 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.c +++ b/drivers/net/wireless/iwlwifi/iwl-io.c | |||
@@ -298,8 +298,8 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask) | |||
298 | } | 298 | } |
299 | EXPORT_SYMBOL_GPL(iwl_clear_bits_prph); | 299 | EXPORT_SYMBOL_GPL(iwl_clear_bits_prph); |
300 | 300 | ||
301 | void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr, | 301 | void _iwl_read_targ_mem_dwords(struct iwl_trans *trans, u32 addr, |
302 | void *buf, int words) | 302 | void *buf, int dwords) |
303 | { | 303 | { |
304 | unsigned long flags; | 304 | unsigned long flags; |
305 | int offs; | 305 | int offs; |
@@ -308,26 +308,26 @@ void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr, | |||
308 | spin_lock_irqsave(&trans->reg_lock, flags); | 308 | spin_lock_irqsave(&trans->reg_lock, flags); |
309 | if (likely(iwl_grab_nic_access(trans))) { | 309 | if (likely(iwl_grab_nic_access(trans))) { |
310 | iwl_write32(trans, HBUS_TARG_MEM_RADDR, addr); | 310 | iwl_write32(trans, HBUS_TARG_MEM_RADDR, addr); |
311 | for (offs = 0; offs < words; offs++) | 311 | for (offs = 0; offs < dwords; offs++) |
312 | vals[offs] = iwl_read32(trans, HBUS_TARG_MEM_RDAT); | 312 | vals[offs] = iwl_read32(trans, HBUS_TARG_MEM_RDAT); |
313 | iwl_release_nic_access(trans); | 313 | iwl_release_nic_access(trans); |
314 | } | 314 | } |
315 | spin_unlock_irqrestore(&trans->reg_lock, flags); | 315 | spin_unlock_irqrestore(&trans->reg_lock, flags); |
316 | } | 316 | } |
317 | EXPORT_SYMBOL_GPL(_iwl_read_targ_mem_words); | 317 | EXPORT_SYMBOL_GPL(_iwl_read_targ_mem_dwords); |
318 | 318 | ||
319 | u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr) | 319 | u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr) |
320 | { | 320 | { |
321 | u32 value; | 321 | u32 value; |
322 | 322 | ||
323 | _iwl_read_targ_mem_words(trans, addr, &value, 1); | 323 | _iwl_read_targ_mem_dwords(trans, addr, &value, 1); |
324 | 324 | ||
325 | return value; | 325 | return value; |
326 | } | 326 | } |
327 | EXPORT_SYMBOL_GPL(iwl_read_targ_mem); | 327 | EXPORT_SYMBOL_GPL(iwl_read_targ_mem); |
328 | 328 | ||
329 | int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr, | 329 | int _iwl_write_targ_mem_dwords(struct iwl_trans *trans, u32 addr, |
330 | void *buf, int words) | 330 | void *buf, int dwords) |
331 | { | 331 | { |
332 | unsigned long flags; | 332 | unsigned long flags; |
333 | int offs, result = 0; | 333 | int offs, result = 0; |
@@ -336,7 +336,7 @@ int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr, | |||
336 | spin_lock_irqsave(&trans->reg_lock, flags); | 336 | spin_lock_irqsave(&trans->reg_lock, flags); |
337 | if (likely(iwl_grab_nic_access(trans))) { | 337 | if (likely(iwl_grab_nic_access(trans))) { |
338 | iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr); | 338 | iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr); |
339 | for (offs = 0; offs < words; offs++) | 339 | for (offs = 0; offs < dwords; offs++) |
340 | iwl_write32(trans, HBUS_TARG_MEM_WDAT, vals[offs]); | 340 | iwl_write32(trans, HBUS_TARG_MEM_WDAT, vals[offs]); |
341 | iwl_release_nic_access(trans); | 341 | iwl_release_nic_access(trans); |
342 | } else | 342 | } else |
@@ -345,10 +345,10 @@ int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr, | |||
345 | 345 | ||
346 | return result; | 346 | return result; |
347 | } | 347 | } |
348 | EXPORT_SYMBOL_GPL(_iwl_write_targ_mem_words); | 348 | EXPORT_SYMBOL_GPL(_iwl_write_targ_mem_dwords); |
349 | 349 | ||
350 | int iwl_write_targ_mem(struct iwl_trans *trans, u32 addr, u32 val) | 350 | int iwl_write_targ_mem(struct iwl_trans *trans, u32 addr, u32 val) |
351 | { | 351 | { |
352 | return _iwl_write_targ_mem_words(trans, addr, &val, 1); | 352 | return _iwl_write_targ_mem_dwords(trans, addr, &val, 1); |
353 | } | 353 | } |
354 | EXPORT_SYMBOL_GPL(iwl_write_targ_mem); | 354 | EXPORT_SYMBOL_GPL(iwl_write_targ_mem); |