lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: move eeprom version printout to eeprom init

Browse Source 
It doesn't belong into firmware loading,
it should instead be printed after loading
the EEPROM.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
This commit is contained in:
Johannes Berg
2010-04-28 12:09:15 -07:00
committed by Reinette Chatre
parent 22adba2a69
commit d1358f62d4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@@ -1551,7 +1551,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
u32 api_ver, build; u32 api_ver, build;
u32 inst_size, data_size, init_size, init_data_size, boot_size; u32 inst_size, data_size, init_size, init_data_size, boot_size;
int err, hdr_size; int err, hdr_size;
u16 eeprom_ver;
char buildstr[25]; char buildstr[25];
if (!ucode_raw) { if (!ucode_raw) {
@@ -1654,11 +1653,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
IWL_UCODE_SERIAL(priv->ucode_ver), IWL_UCODE_SERIAL(priv->ucode_ver),
buildstr); buildstr);
eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
IWL_DEBUG_INFO(priv, "NVM Type: %s, version: 0x%x\n",
(priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
? "OTP" : "EEPROM", eeprom_ver);
IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n", IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
priv->ucode_ver); priv->ucode_ver);
IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n", IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",

7
drivers/net/wireless/iwlwifi/iwl-eeprom.c
View File

@@ -589,9 +589,16 @@ int iwl_eeprom_init(struct iwl_priv *priv)
e[addr / 2] = cpu_to_le16(r >> 16); e[addr / 2] = cpu_to_le16(r >> 16);
} }
} }
IWL_DEBUG_INFO(priv, "NVM Type: %s, version: 0x%x\n",
(priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
? "OTP" : "EEPROM",
iwl_eeprom_query16(priv, EEPROM_VERSION));
ret = 0; ret = 0;
done: done:
priv->cfg->ops->lib->eeprom_ops.release_semaphore(priv); priv->cfg->ops->lib->eeprom_ops.release_semaphore(priv);
err: err:
if (ret) if (ret)
iwl_eeprom_free(priv); iwl_eeprom_free(priv);