提交 5bd1d2c1 编写于 作者: L Luca Coelho

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: NLuca Coelho <luciano.coelho@intel.com>
上级 8a0d53ce
...@@ -388,7 +388,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) ...@@ -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) { if (IWL_MVM_PARSE_NVM && read_nvm) {
ret = iwl_nvm_init(mvm, true); ret = iwl_nvm_init(mvm);
if (ret) { if (ret) {
IWL_ERR(mvm, "Failed to read NVM: %d\n", ret); IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
goto error; goto error;
...@@ -486,8 +486,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) ...@@ -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 */ /* Read the NVM only at driver load time, no need to do this twice */
if (read_nvm) { if (read_nvm) {
/* Read nvm */ ret = iwl_nvm_init(mvm);
ret = iwl_nvm_init(mvm, true);
if (ret) { if (ret) {
IWL_ERR(mvm, "Failed to read NVM: %d\n", ret); IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
goto remove_notif; goto remove_notif;
......
...@@ -1373,7 +1373,7 @@ int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear); ...@@ -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); void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm);
/* NVM */ /* 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_load_nvm_to_nic(struct iwl_mvm *mvm);
int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm); int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm);
......
...@@ -546,7 +546,7 @@ int iwl_mvm_load_nvm_to_nic(struct iwl_mvm *mvm) ...@@ -546,7 +546,7 @@ int iwl_mvm_load_nvm_to_nic(struct iwl_mvm *mvm)
return ret; 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; int ret, section;
u32 size_read = 0; u32 size_read = 0;
...@@ -557,7 +557,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) ...@@ -557,7 +557,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic)
return -EINVAL; return -EINVAL;
/* load NVM values from nic */ /* load NVM values from nic */
if (read_nvm_from_nic) {
/* Read From FW NVM */ /* Read From FW NVM */
IWL_DEBUG_EEPROM(mvm->trans->dev, "Read from NVM\n"); 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) ...@@ -613,7 +612,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic)
if (!size_read) if (!size_read)
IWL_ERR(mvm, "OTP is blank\n"); IWL_ERR(mvm, "OTP is blank\n");
kfree(nvm_buffer); kfree(nvm_buffer);
}
/* Only if PNVM selected in the mod param - load external NVM */ /* Only if PNVM selected in the mod param - load external NVM */
if (mvm->nvm_file_name) { if (mvm->nvm_file_name) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册