1 files changed, 0 insertions, 86 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 2440248c8e69..76866b9e5686 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -491,98 +491,12 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
         IWL_ERR(mvm, "0x%08X | isr status reg\n", table.nic_isr_pref);
 }
 
-static void iwl_mvm_dump_nic_error_log_old(struct iwl_mvm *mvm)
-{
-        struct iwl_trans *trans = mvm->trans;
-        struct iwl_error_event_table_v1 table;
-        u32 base;
-
-        base = mvm->error_event_table;
-        if (mvm->cur_ucode == IWL_UCODE_INIT) {
-                if (!base)
-                        base = mvm->fw->init_errlog_ptr;
-        } else {
-                if (!base)
-                        base = mvm->fw->inst_errlog_ptr;
-        }
-
-        if (base < 0x800000) {
-                IWL_ERR(mvm,
-                        "Not valid error log pointer 0x%08X for %s uCode\n",
-                        base,
-                        (mvm->cur_ucode == IWL_UCODE_INIT)
-                                        ? "Init" : "RT");
-                return;
-        }
-
-        iwl_trans_read_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");
-                IWL_ERR(trans, "Status: 0x%08lX, count: %d\n",
-                        mvm->status, table.valid);
-        }
-
-        /* Do not change this output - scripts rely on it */
-
-        IWL_ERR(mvm, "Loaded firmware version: %s\n", mvm->fw->fw_version);
-
-        trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low,
-                                      table.data1, table.data2, table.data3,
-                                      table.blink2, table.ilink1, table.ilink2,
-                                      table.bcon_time, table.gp1, table.gp2,
-                                      table.gp3, table.ucode_ver, 0,
-                                      table.hw_ver, table.brd_ver);
-        IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id,
-                desc_lookup(table.error_id));
-        IWL_ERR(mvm, "0x%08X | uPc\n", table.pc);
-        IWL_ERR(mvm, "0x%08X | branchlink1\n", table.blink1);
-        IWL_ERR(mvm, "0x%08X | branchlink2\n", table.blink2);
-        IWL_ERR(mvm, "0x%08X | interruptlink1\n", table.ilink1);
-        IWL_ERR(mvm, "0x%08X | interruptlink2\n", table.ilink2);
-        IWL_ERR(mvm, "0x%08X | data1\n", table.data1);
-        IWL_ERR(mvm, "0x%08X | data2\n", table.data2);
-        IWL_ERR(mvm, "0x%08X | data3\n", table.data3);
-        IWL_ERR(mvm, "0x%08X | beacon time\n", table.bcon_time);
-        IWL_ERR(mvm, "0x%08X | tsf low\n", table.tsf_low);
-        IWL_ERR(mvm, "0x%08X | tsf hi\n", table.tsf_hi);
-        IWL_ERR(mvm, "0x%08X | time gp1\n", table.gp1);
-        IWL_ERR(mvm, "0x%08X | time gp2\n", table.gp2);
-        IWL_ERR(mvm, "0x%08X | time gp3\n", table.gp3);
-        IWL_ERR(mvm, "0x%08X | uCode version\n", table.ucode_ver);
-        IWL_ERR(mvm, "0x%08X | hw version\n", table.hw_ver);
-        IWL_ERR(mvm, "0x%08X | board version\n", table.brd_ver);
-        IWL_ERR(mvm, "0x%08X | hcmd\n", table.hcmd);
-        IWL_ERR(mvm, "0x%08X | isr0\n", table.isr0);
-        IWL_ERR(mvm, "0x%08X | isr1\n", table.isr1);
-        IWL_ERR(mvm, "0x%08X | isr2\n", table.isr2);
-        IWL_ERR(mvm, "0x%08X | isr3\n", table.isr3);
-        IWL_ERR(mvm, "0x%08X | isr4\n", table.isr4);
-        IWL_ERR(mvm, "0x%08X | isr_pref\n", table.isr_pref);
-        IWL_ERR(mvm, "0x%08X | wait_event\n", table.wait_event);
-        IWL_ERR(mvm, "0x%08X | l2p_control\n", table.l2p_control);
-        IWL_ERR(mvm, "0x%08X | l2p_duration\n", table.l2p_duration);
-        IWL_ERR(mvm, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);
-        IWL_ERR(mvm, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);
-        IWL_ERR(mvm, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);
-        IWL_ERR(mvm, "0x%08X | timestamp\n", table.u_timestamp);
-        IWL_ERR(mvm, "0x%08X | flow_handler\n", table.flow_handler);
-
-        if (mvm->support_umac_log)
-                iwl_mvm_dump_umac_error_log(mvm);
-}
-
 void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
 {
         struct iwl_trans *trans = mvm->trans;
         struct iwl_error_event_table table;
         u32 base;
 
-        if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_NEW_VERSION)) {
-                iwl_mvm_dump_nic_error_log_old(mvm);
-                return;
-        }
-
         base = mvm->error_event_table;
         if (mvm->cur_ucode == IWL_UCODE_INIT) {
                 if (!base)