Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a80c7a69 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: constify the parameters of a few functions in fw-dbg.c 



The debug functions of fw-dbg.c don't really need to modify
the trigger and the description they receive as a parameter.
Constify the pointers.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent be720d3f

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+2 −2
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ struct iwl_trans_ops { 
	void (*resume)(struct iwl_trans *trans);



	struct iwl_trans_dump_data *(*dump_data)(struct iwl_trans *trans,

						 struct iwl_fw_dbg_trigger_tlv

						 const struct iwl_fw_dbg_trigger_tlv

						 *trigger);

};
@@ -966,7 +966,7 @@ static inline void iwl_trans_resume(struct iwl_trans *trans) 


static inline struct iwl_trans_dump_data *

iwl_trans_dump_data(struct iwl_trans *trans,

		    struct iwl_fw_dbg_trigger_tlv *trigger)

		    const struct iwl_fw_dbg_trigger_tlv *trigger)

{

	if (!trans->ops->dump_data)

		return NULL;

drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c

+4 −4
Original line number Diff line number Diff line
@@ -681,15 +681,15 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
	clear_bit(IWL_MVM_STATUS_DUMPING_FW_LOG, &mvm->status);

}



struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert = {

const struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert = {

	.trig_desc = {

		.type = cpu_to_le32(FW_DBG_TRIGGER_FW_ASSERT),

	},

};



int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,

				struct iwl_mvm_dump_desc *desc,

				struct iwl_fw_dbg_trigger_tlv *trigger)

				const struct iwl_mvm_dump_desc *desc,

				const struct iwl_fw_dbg_trigger_tlv *trigger)

{

	unsigned int delay = 0;
@@ -715,7 +715,7 @@ int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm, 


int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,

			   const char *str, size_t len,

			   struct iwl_fw_dbg_trigger_tlv *trigger)

			   const struct iwl_fw_dbg_trigger_tlv *trigger)

{

	struct iwl_mvm_dump_desc *desc;

drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h

+3 −3
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ 
void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm);

void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm);

int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,

				struct iwl_mvm_dump_desc *desc,

				struct iwl_fw_dbg_trigger_tlv *trigger);

				const struct iwl_mvm_dump_desc *desc,

				const struct iwl_fw_dbg_trigger_tlv *trigger);

int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig,

			   const char *str, size_t len,

			   struct iwl_fw_dbg_trigger_tlv *trigger);

			   const struct iwl_fw_dbg_trigger_tlv *trigger);

int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,

				struct iwl_fw_dbg_trigger_tlv *trigger,

				const char *fmt, ...) __printf(3, 4);

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ struct iwl_mvm_dump_desc { 
	struct iwl_fw_error_dump_trigger_desc trig_desc;

};



extern struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert;

extern const struct iwl_mvm_dump_desc iwl_mvm_dump_desc_assert;



struct iwl_mvm_phy_ctxt {

	u16 id;
@@ -732,8 +732,8 @@ struct iwl_mvm { 
	s8 restart_fw;

	u8 fw_dbg_conf;

	struct delayed_work fw_dump_wk;

	struct iwl_mvm_dump_desc *fw_dump_desc;

	struct iwl_fw_dbg_trigger_tlv *fw_dump_trig;

	const struct iwl_mvm_dump_desc *fw_dump_desc;

	const struct iwl_fw_dbg_trigger_tlv *fw_dump_trig;



#ifdef CONFIG_IWLWIFI_LEDS

	struct led_classdev led;

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+1 −1
Original line number Diff line number Diff line
@@ -2364,7 +2364,7 @@ iwl_trans_pcie_dump_monitor(struct iwl_trans *trans, 


static struct iwl_trans_dump_data

*iwl_trans_pcie_dump_data(struct iwl_trans *trans,

			  struct iwl_fw_dbg_trigger_tlv *trigger)

			  const struct iwl_fw_dbg_trigger_tlv *trigger)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_fw_error_dump_data *data;