iwlwifi: remove double verification of ucode sections
authorDavid Spinadel <david.spinadel@intel.com>
Tue, 13 Mar 2012 12:46:38 +0000 (14:46 +0200)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Mon, 16 Apr 2012 21:36:20 +0000 (14:36 -0700)
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
drivers/net/wireless/iwlwifi/iwl-drv.c

index da4d85a32d314273ebc5391b4894af44c84ca439..17485e715424d9392577d337d675b369072bbad7 100644 (file)
@@ -807,42 +807,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 
        IWL_INFO(drv, "loaded firmware version %s", drv->fw.fw_version);
 
-       /*
-        * For any of the failures below (before allocating pci memory)
-        * we will try to load a version with a smaller API -- maybe the
-        * user just got a corrupted version of the latest API.
-        */
-
-       IWL_DEBUG_INFO(drv, "f/w package hdr ucode version raw = 0x%x\n",
-                      drv->fw.ucode_ver);
-       IWL_DEBUG_INFO(drv, "f/w package hdr runtime inst size = %Zd\n",
-               get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                            IWL_UCODE_SECTION_INST));
-       IWL_DEBUG_INFO(drv, "f/w package hdr runtime data size = %Zd\n",
-               get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                            IWL_UCODE_SECTION_DATA));
-       IWL_DEBUG_INFO(drv, "f/w package hdr init inst size = %Zd\n",
-               get_sec_size(&pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST));
-       IWL_DEBUG_INFO(drv, "f/w package hdr init data size = %Zd\n",
-               get_sec_size(&pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA));
-
-       /* Verify that uCode images will fit in card's SRAM */
-       if (get_sec_size(&pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_INST) >
-                                                       cfg->max_inst_size) {
-               IWL_ERR(drv, "uCode instr len %Zd too large to fit in\n",
-                       get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                                    IWL_UCODE_SECTION_INST));
-               goto try_again;
-       }
-
-       if (get_sec_size(&pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_DATA) >
-                                                       cfg->max_data_size) {
-               IWL_ERR(drv, "uCode data len %Zd too large to fit in\n",
-                       get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                                    IWL_UCODE_SECTION_DATA));
-               goto try_again;
-       }
-
        /*
         * In mvm uCode there is no difference between data and instructions
         * sections.