iwlwifi: rename iwl_mvm_fw_error_next_data

This is not related to mvm. Rename to iwl_fw_error_next_data.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
index aa0f85ee65b5cf1dd43c448824311f09c6b2ca59..3584a75833fe5439ebea2263b5ec34d9ede99e41 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
@@ -145,12 +145,12 @@ struct iwl_fw_error_dump_info {
 } __packed;
 
 /**
- * iwl_mvm_fw_error_next_data - advance fw error dump data pointer
+ * iwl_fw_error_next_data - advance fw error dump data pointer
  * @data: previous data block
  * Returns: next data block
  */
 static inline struct iwl_fw_error_dump_data *
-iwl_mvm_fw_error_next_data(struct iwl_fw_error_dump_data *data)
+iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data)
 {
        return (void *)(data->data + le32_to_cpu(data->len));
 }

diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 3ab33e296686f05adb90f04929fdc3de5557ea3d..7bb763f3052b3b39d74d2f07a0589f607cd56fe0 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -870,12 +870,12 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
        strncpy(dump_info->bus_human_readable, mvm->dev->bus->name,
                sizeof(dump_info->bus_human_readable));
 
-       dump_data = iwl_mvm_fw_error_next_data(dump_data);
+       dump_data = iwl_fw_error_next_data(dump_data);
        dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_RXF);
        dump_data->len = cpu_to_le32(mvm->fw_error_rxf_len);
        memcpy(dump_data->data, mvm->fw_error_rxf, mvm->fw_error_rxf_len);
 
-       dump_data = iwl_mvm_fw_error_next_data(dump_data);
+       dump_data = iwl_fw_error_next_data(dump_data);
        dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_SRAM);
        dump_data->len = cpu_to_le32(mvm->fw_error_sram_len);
 
@@ -895,7 +895,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
        mvm->fw_error_sram_len = 0;
 
        if (trans_len) {
-               void *buf = iwl_mvm_fw_error_next_data(dump_data);
+               void *buf = iwl_fw_error_next_data(dump_data);
                u32 real_trans_len = iwl_trans_dump_data(mvm->trans, buf,
                                                         trans_len);
                dump_data = (void *)((u8 *)buf + real_trans_len);