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

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

iwlwifi: mvm: cleanup redundant no_power_up_nic_in_init config 



This is never really used anymore.

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

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -359,7 +359,6 @@ struct iwl_cfg { 
	    high_temp:1,

	    high_temp:1,

	    mac_addr_from_csr:1,

	    mac_addr_from_csr:1,

	    lp_xtal_workaround:1,

	    lp_xtal_workaround:1,

	    no_power_up_nic_in_init:1,

	    disable_dummy_notification:1,

	    disable_dummy_notification:1,

	    apmg_not_supported:1,

	    apmg_not_supported:1,

	    mq_rx_supported:1,

	    mq_rx_supported:1,

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

+15 −31
Original line number Original line Diff line number Diff line
@@ -712,21 +712,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
		IWL_DEBUG_EEPROM(mvm->trans->dev,

		IWL_DEBUG_EEPROM(mvm->trans->dev,

				 "working without external nvm file\n");

				 "working without external nvm file\n");





	if (WARN(cfg->no_power_up_nic_in_init && !mvm->nvm_file_name,

		 "not allowing power-up and not having nvm_file\n"))

		goto out_free;



	/*

	 * Even if nvm exists in the nvm_file driver should read again the nvm

	 * from the nic because there might be entries that exist in the OTP

	 * and not in the file.

	 * for nics with no_power_up_nic_in_init: rely completley on nvm_file

	 */

	if (cfg->no_power_up_nic_in_init && mvm->nvm_file_name) {

		err = iwl_nvm_init(mvm, false);

		if (err)

			goto out_free;

	} else {

	err = iwl_trans_start_hw(mvm->trans);

	err = iwl_trans_start_hw(mvm->trans);

	if (err)

	if (err)

		goto out_free;

		goto out_free;
@@ -743,7 +728,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
		IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", err);

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

		goto out_free;

		goto out_free;

	}

	}

	}





	scan_size = iwl_mvm_scan_size(mvm);

	scan_size = iwl_mvm_scan_size(mvm);
@@ -784,8 +768,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	flush_delayed_work(&mvm->fw_dump_wk);

	flush_delayed_work(&mvm->fw_dump_wk);

	iwl_phy_db_free(mvm->phy_db);

	iwl_phy_db_free(mvm->phy_db);

	kfree(mvm->scan_cmd);

	kfree(mvm->scan_cmd);

	if (!cfg->no_power_up_nic_in_init || !mvm->nvm_file_name)

	iwl_trans_op_mode_leave(trans);

	iwl_trans_op_mode_leave(trans);



	ieee80211_free_hw(mvm->hw);

	ieee80211_free_hw(mvm->hw);

	return NULL;

	return NULL;

}

}