iwlwifi: dbg_ini: remove redundant checking of ini mode

There are several flows where the driver checks if it runs in ini mode.
Some of these flows are no longer used in ini mode or there is another
condition that check the ini mode in the same flow. Either way, those
conditions are redundant. Remove the redundant conditions.

Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 56222d39eef2e8a8b4217b576225dc21984a65ef..780eac6c9dc16ec709bdd2d5010679b52d0918b5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2023,7 +2023,7 @@ static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
        if (!dump_file)
                goto out;
 
-       if (!fwrt->trans->ini_valid && fwrt->dump.monitor_only)
+       if (fwrt->dump.monitor_only)
                dump_mask &= IWL_FW_ERROR_DUMP_FW_MONITOR;
 
        fw_error_dump.trans_ptr = iwl_trans_dump_data(fwrt->trans, dump_mask);
@@ -2275,9 +2275,6 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,
        int ret, len = 0;
        char buf[64];
 
-       if (fwrt->trans->ini_valid)
-               return 0;
-
        if (fmt) {
                va_list ap;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
index d7a285874973c0cc403bed4851aafb53d3dbf2e9..23e6080ddfcb3bdbbbc11d31d13958cdd6081d9e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
@@ -362,7 +362,7 @@ void iwl_fw_error_dump_wk(struct work_struct *work);
 
 static inline bool iwl_fw_dbg_type_on(struct iwl_fw_runtime *fwrt, u32 type)
 {
-       return (fwrt->fw->dbg.dump_mask & BIT(type) || fwrt->trans->ini_valid);
+       return (fwrt->fw->dbg.dump_mask & BIT(type));
 }
 
 static inline bool iwl_fw_dbg_is_d3_debug_enabled(struct iwl_fw_runtime *fwrt)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index b81363328607cbee3f9fdcc08186b559a1458a0b..14d1d6fe927f13d144a52942a91a75af790cf97f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3041,10 +3041,6 @@ iwl_trans_pcie_dump_pointers(struct iwl_trans *trans,
                base_high = DBGC_CUR_DBGBUF_BASE_ADDR_MSB;
                write_ptr = DBGC_CUR_DBGBUF_STATUS;
                wrap_cnt = DBGC_DBGBUF_WRAP_AROUND;
-       } else if (trans->ini_valid) {
-               base = iwl_umac_prph(trans, MON_BUFF_BASE_ADDR_VER2);
-               write_ptr = iwl_umac_prph(trans, MON_BUFF_WRPTR_VER2);
-               wrap_cnt = iwl_umac_prph(trans, MON_BUFF_CYCLE_CNT_VER2);
        } else if (trans->dbg_dest_tlv) {
                write_ptr = le32_to_cpu(trans->dbg_dest_tlv->write_ptr_reg);
                wrap_cnt = le32_to_cpu(trans->dbg_dest_tlv->wrap_count);
@@ -3075,11 +3071,10 @@ iwl_trans_pcie_dump_monitor(struct iwl_trans *trans,
 {
        u32 len = 0;
 
-       if ((trans->num_blocks &&
+       if (trans->dbg_dest_tlv ||
+           (trans->num_blocks &&
             (trans->cfg->device_family == IWL_DEVICE_FAMILY_7000 ||
-             trans->cfg->device_family >= IWL_DEVICE_FAMILY_AX210 ||
-             trans->ini_valid)) ||
-           (trans->dbg_dest_tlv && !trans->ini_valid)) {
+             trans->cfg->device_family >= IWL_DEVICE_FAMILY_AX210))) {
                struct iwl_fw_error_dump_fw_mon *fw_mon_data;
 
                (*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR);