iwlwifi: pcie: remove dead code

If device family is 8000 then iwl_pcie_load_cpu_sections()
won't be called at all (iwl_pcie_load_cpu_sections_8000() is
called in that case) so this piece of code never gets called.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
index 849ee79cc094e1824583c7c2d9a643ba107c43e5..406ef301b8ab8aedd8a1e8e93e8800d53872a233 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
@@ -302,7 +302,6 @@
 #define OSC_CLK_FORCE_CONTROL          (0x8)
 
 #define FH_UCODE_LOAD_STATUS           (0x1AF0)
-#define CSR_UCODE_LOAD_STATUS_ADDR     (0x1E70)
 
 /*
  * Replacing FH_UCODE_LOAD_STATUS
@@ -311,21 +310,9 @@
  */
 #define UREG_UCODE_LOAD_STATUS         (0xa05c40)
 
-enum secure_load_status_reg {
-       LMPM_CPU_UCODE_LOADING_STARTED                  = 0x00000001,
-       LMPM_CPU_HDRS_LOADING_COMPLETED                 = 0x00000003,
-       LMPM_CPU_UCODE_LOADING_COMPLETED                = 0x00000007,
-       LMPM_CPU_STATUS_NUM_OF_LAST_COMPLETED           = 0x000000F8,
-       LMPM_CPU_STATUS_NUM_OF_LAST_LOADED_BLOCK        = 0x0000FF00,
-};
-
-#define LMPM_SECURE_INSPECTOR_CODE_ADDR        (0x1E38)
-#define LMPM_SECURE_INSPECTOR_DATA_ADDR        (0x1E3C)
 #define LMPM_SECURE_UCODE_LOAD_CPU1_HDR_ADDR   (0x1E78)
 #define LMPM_SECURE_UCODE_LOAD_CPU2_HDR_ADDR   (0x1E7C)
 
-#define LMPM_SECURE_INSPECTOR_CODE_MEM_SPACE   (0x400000)
-#define LMPM_SECURE_INSPECTOR_DATA_MEM_SPACE   (0x402000)
 #define LMPM_SECURE_CPU1_HDR_MEM_SPACE         (0x420000)
 #define LMPM_SECURE_CPU2_HDR_MEM_SPACE         (0x420400)
 

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 039eecaa6fcf397de44ad34730f0410778d77a8c..2f46eedd7c4d215f652adaffd2500007fbf662c2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -903,14 +903,6 @@ static int iwl_pcie_load_cpu_sections(struct iwl_trans *trans,
                        return ret;
        }
 
-       if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
-               iwl_set_bits_prph(trans,
-                                 CSR_UCODE_LOAD_STATUS_ADDR,
-                                 (LMPM_CPU_UCODE_LOADING_COMPLETED |
-                                  LMPM_CPU_HDRS_LOADING_COMPLETED |
-                                  LMPM_CPU_UCODE_LOADING_STARTED) <<
-                                       shift_param);
-
        *first_ucode_section = last_read_idx;
 
        return 0;