iwlwifi: mvm: remove the read_nvm from iwl_run_unified_mvm_ucode

Similarly to what I did to iwl_run_init_mvm_ucode, there is no
need to pass the read_nvm parameter. Either we have an NVM
and we don't need to read it, or we don't and we need to read it.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201209231352.1b764faecfee.I2da0ada577fc16268125a4a15b5e725c18c643ee@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index a31a77f828faf8c548fe96ce9c4103d535405cb4..c29e55720179a474edfa8387127ce6f0666b4a3d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -460,7 +460,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
        return 0;
 }
 
-static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
+static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
 {
        struct iwl_notification_wait init_wait;
        struct iwl_nvm_access_complete_cmd nvm_complete = {};
@@ -517,7 +517,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
                iwl_mvm_load_nvm_to_nic(mvm);
        }
 
-       if (IWL_MVM_PARSE_NVM && read_nvm) {
+       if (IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
                ret = iwl_nvm_init(mvm);
                if (ret) {
                        IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
@@ -542,7 +542,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
                return ret;
 
        /* Read the NVM only at driver load time, no need to do this twice */
-       if (!IWL_MVM_PARSE_NVM && read_nvm) {
+       if (!IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
                mvm->nvm_data = iwl_get_nvm(mvm->trans, mvm->fw);
                if (IS_ERR(mvm->nvm_data)) {
                        ret = PTR_ERR(mvm->nvm_data);
@@ -657,7 +657,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm)
        int ret;
 
        if (iwl_mvm_has_unified_ucode(mvm))
-               return iwl_run_unified_mvm_ucode(mvm, true);
+               return iwl_run_unified_mvm_ucode(mvm);
 
        lockdep_assert_held(&mvm->mutex);
 
@@ -1330,7 +1330,7 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm)
        int ret;
 
        if (iwl_mvm_has_unified_ucode(mvm))
-               return iwl_run_unified_mvm_ucode(mvm, false);
+               return iwl_run_unified_mvm_ucode(mvm);
 
        WARN_ON(!mvm->nvm_data);
        ret = iwl_run_init_mvm_ucode(mvm);