summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
diff options
context:
space:
mode:
authorLuca Coelho2017-08-15 17:46:44 +0200
committerLuca Coelho2017-08-18 16:36:42 +0200
commit5bd1d2c1ea9d0f8ca7ad0457c3a24fb91c9ca756 (patch)
treeb44fb5e09e4d66c9e9f8dc99c589d8299f2755e1 /drivers/net/wireless/intel/iwlwifi/mvm/fw.c
parentiwlwifi: fw: fix lar_enabled endian problem in iwl_fw_get_nvm (diff)
downloadkernel-qcow2-linux-5bd1d2c1ea9d0f8ca7ad0457c3a24fb91c9ca756.tar.gz
kernel-qcow2-linux-5bd1d2c1ea9d0f8ca7ad0457c3a24fb91c9ca756.tar.xz
kernel-qcow2-linux-5bd1d2c1ea9d0f8ca7ad0457c3a24fb91c9ca756.zip
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: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/fw.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/fw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 90ae50f7768a..3d65ab49a8a6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -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;