iwlwifi: dbg: move debug data to a struct

The debug variables are bloating the iwl_fw struct.  And the fields
are out of order, missing docs and some are redundant.

Clean this up.  This serves as preparation for unionizing it for the
new ini infra.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 0599d323cbeb..5f2f599a7ccd 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -748,12 +748,12 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         iwl_trans_configure(mvm->trans, &trans_cfg);
 
         trans->rx_mpdu_cmd = REPLY_RX_MPDU_CMD;
-        trans->dbg_dest_tlv = mvm->fw->dbg_dest_tlv;
-        trans->dbg_dest_reg_num = mvm->fw->dbg_dest_reg_num;
-        memcpy(trans->dbg_conf_tlv, mvm->fw->dbg_conf_tlv,
+        trans->dbg_dest_tlv = mvm->fw->dbg.dest_tlv;
+        trans->dbg_n_dest_reg = mvm->fw->dbg.n_dest_reg;
+        memcpy(trans->dbg_conf_tlv, mvm->fw->dbg.conf_tlv,
                sizeof(trans->dbg_conf_tlv));
-        trans->dbg_trigger_tlv = mvm->fw->dbg_trigger_tlv;
-        trans->dbg_dump_mask = mvm->fw->dbg_dump_mask;
+        trans->dbg_trigger_tlv = mvm->fw->dbg.trigger_tlv;
+        trans->dbg_dump_mask = mvm->fw->dbg.dump_mask;
 
         trans->iml = mvm->fw->iml;
         trans->iml_len = mvm->fw->iml_len;