iwlwifi: mvm: move umac_error_event_table validity check to where it's set

There's no point in checking the validity of the
umac_error_event_table pointer every time we generate a dump.  It's
cleaner to do so when we read the value, namely when we receive the
alive data.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

1 files changed, 4 insertions, 14 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 4ade688db63b..d46115e2d69e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -455,21 +455,12 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
 {
         struct iwl_trans *trans = mvm->trans;
         struct iwl_umac_error_event_table table;
-        u32 base;
 
-        base = mvm->umac_error_event_table;
-
-        if (base < (mvm->trans->cfg->device_family == IWL_DEVICE_FAMILY_A000 ?
-                    0x400000 : 0x800000)) {
-                IWL_ERR(mvm,
-                        "Not valid error log pointer 0x%08X for %s uCode\n",
-                        base,
-                        (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT)
-                        ? "Init" : "RT");
+        if (!mvm->support_umac_log)
                 return;
-        }
 
-        iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));
+        iwl_trans_read_mem_bytes(trans, mvm->umac_error_event_table, &table,
+                                 sizeof(table));
 
         if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {
                 IWL_ERR(trans, "Start IWL Error Log Dump:\n");
@@ -609,8 +600,7 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
         if (mvm->error_event_table[1])
                 iwl_mvm_dump_lmac_error_log(mvm, mvm->error_event_table[1]);
 
-        if (mvm->support_umac_log)
-                iwl_mvm_dump_umac_error_log(mvm);
+        iwl_mvm_dump_umac_error_log(mvm);
 }
 
 int iwl_mvm_find_free_queue(struct iwl_mvm *mvm, u8 sta_id, u8 minq, u8 maxq)