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

Commit 5bd1d2c1 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: remove useless argument in iwl_nvm_init() 



We always call iwl_nvm_init() with read_nvm_from_nic == true, so this
argument is useless.  Remove it.

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

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

+2 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	}



	if (IWL_MVM_PARSE_NVM && read_nvm) {

		ret = iwl_nvm_init(mvm, true);

		ret = iwl_nvm_init(mvm);

		if (ret) {

			IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);

			goto error;
@@ -486,8 +486,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 


	/* Read the NVM only at driver load time, no need to do this twice */

	if (read_nvm) {

		/* Read nvm */

		ret = iwl_nvm_init(mvm, true);

		ret = iwl_nvm_init(mvm);

		if (ret) {

			IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);

			goto remove_notif;

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

+1 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,7 @@ int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear); 
void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm);



/* NVM */

int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic);

int iwl_nvm_init(struct iwl_mvm *mvm);

int iwl_mvm_load_nvm_to_nic(struct iwl_mvm *mvm);

int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm);

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

+48 −50
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ int iwl_mvm_load_nvm_to_nic(struct iwl_mvm *mvm) 
	return ret;

}



int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic)

int iwl_nvm_init(struct iwl_mvm *mvm)

{

	int ret, section;

	u32 size_read = 0;
@@ -557,7 +557,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) 
		return -EINVAL;



	/* load NVM values from nic */

	if (read_nvm_from_nic) {

	/* Read From FW NVM */

	IWL_DEBUG_EEPROM(mvm->trans->dev, "Read from NVM\n");
@@ -613,7 +612,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) 
	if (!size_read)

		IWL_ERR(mvm, "OTP is blank\n");

	kfree(nvm_buffer);

	}



	/* Only if PNVM selected in the mod param - load external NVM  */

	if (mvm->nvm_file_name) {