aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-04-28 15:09:15 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-05-10 18:08:54 -0400
commitd1358f62d47c9e872994e5c6e9c9d6e1f31d24c4 (patch)
treec9f7a6ef0a71809fdd2c15b15d78872acf805638 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent22adba2a6995dc24663251ffb954f8856968f26e (diff)
iwlwifi: move eeprom version printout to eeprom init
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 7bcc8a3aee4a..70094bbe485b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1551,7 +1551,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
1551 u32 api_ver, build; 1551 u32 api_ver, build;
1552 u32 inst_size, data_size, init_size, init_data_size, boot_size; 1552 u32 inst_size, data_size, init_size, init_data_size, boot_size;
1553 int err, hdr_size; 1553 int err, hdr_size;
1554 u16 eeprom_ver;
1555 char buildstr[25]; 1554 char buildstr[25];
1556 1555
1557 if (!ucode_raw) { 1556 if (!ucode_raw) {
@@ -1654,11 +1653,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
1654 IWL_UCODE_SERIAL(priv->ucode_ver), 1653 IWL_UCODE_SERIAL(priv->ucode_ver),
1655 buildstr); 1654 buildstr);
1656 1655
1657 eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
1658 IWL_DEBUG_INFO(priv, "NVM Type: %s, version: 0x%x\n",
1659 (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
1660 ? "OTP" : "EEPROM", eeprom_ver);
1661
1662 IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n", 1656 IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
1663 priv->ucode_ver); 1657 priv->ucode_ver);
1664 IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n", 1658 IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",