Commit f5cdcb86 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: fw: make dump_start callback void 



We never return errors there, so just make it void.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220130115024.375b3a28d89e.Ia76e9bf13e26eb148abfebdaf859eab1b81d2af1@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent f1658dcb

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

+2 −3
Original line number Diff line number Diff line
@@ -2939,9 +2939,8 @@ void iwl_fw_error_dump_wk(struct work_struct *work) 
	/* assumes the op mode mutex is locked in dump_start since

	 * iwl_fw_dbg_collect_sync can't run in parallel

	 */

	if (fwrt->ops && fwrt->ops->dump_start &&

	    fwrt->ops->dump_start(fwrt->ops_ctx))

		return;

	if (fwrt->ops && fwrt->ops->dump_start)

		fwrt->ops->dump_start(fwrt->ops_ctx);



	iwl_fw_dbg_collect_sync(fwrt, wks->idx);

drivers/net/wireless/intel/iwlwifi/fw/runtime.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "fw/acpi.h"



struct iwl_fw_runtime_ops {

	int (*dump_start)(void *ctx);

	void (*dump_start)(void *ctx);

	void (*dump_end)(void *ctx);

	bool (*fw_running)(void *ctx);

	int (*send_hcmd)(void *ctx, struct iwl_host_cmd *host_cmd);

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −3
Original line number Diff line number Diff line
@@ -639,13 +639,11 @@ static void iwl_mvm_tx_unblock_dwork(struct work_struct *work) 
	mutex_unlock(&mvm->mutex);

}



static int iwl_mvm_fwrt_dump_start(void *ctx)

static void iwl_mvm_fwrt_dump_start(void *ctx)

{

	struct iwl_mvm *mvm = ctx;



	mutex_lock(&mvm->mutex);



	return 0;

}



static void iwl_mvm_fwrt_dump_end(void *ctx)