diff options
author | Luca Coelho <luciano.coelho@intel.com> | 2018-08-16 09:23:08 +0300 |
---|---|---|
committer | Luca Coelho <luciano.coelho@intel.com> | 2018-12-14 14:04:46 +0300 |
commit | 64866e5da1eabd0c52ff45029b245f5465920031 (patch) | |
tree | 399859acf014f5bf160c0cddd0f57baf4f50c689 /drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | |
parent | 4aeaccd6b5f05a20fd3154581f1ec2e6793cd998 (diff) | |
download | linux-64866e5da1eabd0c52ff45029b245f5465920031.tar.xz |
iwlwifi: move iwl_nvm_check_version() into dvm
This function is only half-used by mvm (i.e. only the nvm_version part
matters, since the calibration version is irrelevant), so it's
pointless to export it from iwlwifi. If mvm uses this function, it
has the additional complexity of setting the calib version to a bogus
value on all cfg structs.
To avoid this, move the function to dvm and make a simple comparison
of the nvm_version in mvm instead.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c index 4e3422a1c7bb..75940ac406b9 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c @@ -927,22 +927,3 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg, return NULL; } IWL_EXPORT_SYMBOL(iwl_parse_eeprom_data); - -/* helper functions */ -int iwl_nvm_check_version(struct iwl_nvm_data *data, - struct iwl_trans *trans) -{ - if (data->nvm_version >= trans->cfg->nvm_ver || - data->calib_version >= trans->cfg->nvm_calib_ver) { - IWL_DEBUG_INFO(trans, "device EEPROM VER=0x%x, CALIB=0x%x\n", - data->nvm_version, data->calib_version); - return 0; - } - - IWL_ERR(trans, - "Unsupported (too old) EEPROM VER=0x%x < 0x%x CALIB=0x%x < 0x%x\n", - data->nvm_version, trans->cfg->nvm_ver, - data->calib_version, trans->cfg->nvm_calib_ver); - return -EINVAL; -} -IWL_EXPORT_SYMBOL(iwl_nvm_check_version); |