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

Commit f2082a53 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: cleanup usage of init_dbg parameter 



Move the init_dbg check to earlier in the function to simplify the
code.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 56f2929b

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

+14 −14
Original line number Diff line number Diff line
@@ -1115,14 +1115,18 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	 * (for example, if we were in RFKILL)

	 */

	ret = iwl_run_init_mvm_ucode(mvm, false);

	if (ret && !iwlmvm_mod_params.init_dbg) {



	if (iwlmvm_mod_params.init_dbg)

		return 0;



	if (ret) {

		IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", ret);

		/* this can't happen */

		if (WARN_ON(ret > 0))

			ret = -ERFKILL;

		goto error;

	}

	if (!iwlmvm_mod_params.init_dbg) {



	/*

	 * Stop and start the transport without entering low power

	 * mode. This will save the state of other components on the
@@ -1132,10 +1136,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	ret = _iwl_trans_start_hw(mvm->trans, false);

	if (ret)

		goto error;

	}



	if (iwlmvm_mod_params.init_dbg)

		return 0;



	ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_REGULAR);

	if (ret) {