iwlwifi: remove support for deprecated RF

One of the RF modules we support has been deprecated and never
released publicly.  Remove support for this module.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
index a5f0c0bf85ec8dd7f271a8954cd6d0823acbc9b1..ca119bd8a32b9c9fc7264efd3e60d9bec63a807e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
@@ -74,13 +74,10 @@
 
 #define  IWL9000_FW_PRE "iwlwifi-9000-pu-a0-jf-a0-"
 #define  IWL9260_FW_PRE "iwlwifi-9260-th-a0-jf-a0-"
-#define  IWL9000LC_FW_PRE "iwlwifi-9000-pu-a0-lc-a0-"
 #define IWL9000_MODULE_FIRMWARE(api) \
        IWL9000_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL9260_MODULE_FIRMWARE(api) \
        IWL9260_FW_PRE "-" __stringify(api) ".ucode"
-#define IWL9000LC_MODULE_FIRMWARE(api) \
-       IWL9000LC_FW_PRE "-" __stringify(api) ".ucode"
 
 #define NVM_HW_SECTION_NUM_FAMILY_9000         10
 
@@ -198,21 +195,5 @@ const struct iwl_cfg iwl9560_2ac_cfg = {
        .integrated = true,
 };
 
-/*
- * TODO the struct below is for internal testing only this should be
- * removed by EO 2016~
- */
-const struct iwl_cfg iwl9000lc_2ac_cfg = {
-       .name = "Intel(R) Dual Band Wireless AC 9000",
-       .fw_name_pre = IWL9000LC_FW_PRE,
-       IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
-       .integrated = true,
-};
-
 MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL9260_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL9000LC_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 94f8a51b633eb25e7c5731944c5e5f00b5673743..96a2ec32f70733185b9afa859f5826ec79554f5b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -449,7 +449,6 @@ extern const struct iwl_cfg iwl4165_2ac_cfg;
 extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;
 extern const struct iwl_cfg iwl8265_2ac_sdio_cfg;
 extern const struct iwl_cfg iwl4165_2ac_sdio_cfg;
-extern const struct iwl_cfg iwl9000lc_2ac_cfg;
 extern const struct iwl_cfg iwl9160_2ac_cfg;
 extern const struct iwl_cfg iwl9260_2ac_cfg;
 extern const struct iwl_cfg iwl9270_2ac_cfg;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index 4ee3b621ec27ab58c899e91c6552f15fc0d5a57a..fa120fb553737b8b5bdd96100ffb69a3679b86c4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -348,7 +348,6 @@ enum {
 
 /* RF_ID value */
 #define CSR_HW_RF_ID_TYPE_JF           (0x00105000)
-#define CSR_HW_RF_ID_TYPE_LC           (0x00101000)
 #define CSR_HW_RF_ID_TYPE_HR           (0x00109000)
 
 /* EEPROM REG */

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index ba8a81cb0e2b7118ae761f9be68e4157477c26e5..d38fcc1a476832553361febea2d2d3e343c77c6f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -667,18 +667,11 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                iwl_trans->cfg = cfg_7265d;
        }
 
-       if (iwl_trans->cfg->rf_id) {
-               if (cfg == &iwl9460_2ac_cfg &&
-                   iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_LC) {
-                       cfg = &iwl9000lc_2ac_cfg;
-                       iwl_trans->cfg = cfg;
-               }
-
-               if (cfg == &iwla000_2ac_cfg_hr &&
-                   iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_JF) {
-                       cfg = &iwla000_2ac_cfg_jf;
-                       iwl_trans->cfg = cfg;
-               }
+       if (iwl_trans->cfg->rf_id &&
+           (cfg == &iwla000_2ac_cfg_hr &&
+            iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_JF)) {
+               cfg = &iwla000_2ac_cfg_jf;
+               iwl_trans->cfg = cfg;
        }
 #endif