]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
iwlwifi: s/iwl_read_targ_mem_words/iwl_read_targ_mem_bytes
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 6 Jun 2012 05:11:33 +0000 (08:11 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 13 Jun 2012 07:01:00 +0000 (09:01 +0200)
This macro gets the bufsize in bytes.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/iwlwifi/dvm/main.c
drivers/net/wireless/iwlwifi/iwl-io.h

index 656ed317c6d3437d83e85c31c49f08df4b211047..e620af3d592df800fce18c6dcee5865ab84f15b9 100644 (file)
@@ -406,7 +406,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)
 
        base = priv->device_pointers.log_event_table;
        if (iwlagn_hw_valid_rtc_data_addr(base)) {
-               iwl_read_targ_mem_words(priv->trans, base, &read, sizeof(read));
+               iwl_read_targ_mem_bytes(priv->trans, base, &read, sizeof(read));
                capacity = read.capacity;
                mode = read.mode;
                num_wraps = read.wrap_counter;
@@ -1671,7 +1671,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
        }
 
        /*TODO: Update dbgfs with ISR error stats obtained below */
-       iwl_read_targ_mem_words(trans, base, &table, sizeof(table));
+       iwl_read_targ_mem_bytes(trans, base, &table, sizeof(table));
 
        if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {
                IWL_ERR(trans, "Start IWL Error Log Dump:\n");
index 4a9a45f771edf35c051d58abcd481f1620cab14f..45a59c940f81cf35a0983f2c64194d9dc96fd159 100644 (file)
@@ -79,7 +79,7 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask);
 void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,
                              void *buf, int words);
 
-#define iwl_read_targ_mem_words(trans, addr, buf, bufsize)     \
+#define iwl_read_targ_mem_bytes(trans, addr, buf, bufsize)     \
        do {                                                    \
                BUILD_BUG_ON((bufsize) % sizeof(u32));          \
                _iwl_read_targ_mem_words(trans, addr, buf,      \