wifi: iwlwifi: cfg: remove rf_id field

This field is always set for >= 9000 series, but then we
already check that, so it's not needed. Remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20250508121306.1277801-11-miriam.rachel.korenblit@intel.com
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index db11252ca73c956d475632611b30f98bbc89b018..f95cf1c0ae034fb438c3d1c11dc11d4304d759df 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -114,7 +114,6 @@ static const struct iwl_base_params iwl_22000_base_params = {
 
 const struct iwl_mac_cfg iwl_qu_mac_cfg = {
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .device_family = IWL_DEVICE_FAMILY_22000,
        .base_params = &iwl_22000_base_params,
@@ -125,7 +124,6 @@ const struct iwl_mac_cfg iwl_qu_mac_cfg = {
 
 const struct iwl_mac_cfg iwl_qu_medium_latency_mac_cfg = {
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .device_family = IWL_DEVICE_FAMILY_22000,
        .base_params = &iwl_22000_base_params,
@@ -136,7 +134,6 @@ const struct iwl_mac_cfg iwl_qu_medium_latency_mac_cfg = {
 
 const struct iwl_mac_cfg iwl_qu_long_latency_mac_cfg = {
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .device_family = IWL_DEVICE_FAMILY_22000,
        .base_params = &iwl_22000_base_params,
@@ -176,7 +173,6 @@ const struct iwl_mac_cfg iwl_ax200_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_22000,
        .base_params = &iwl_22000_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .bisr_workaround = 1,
 };

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index 0c3429dfca2a4854d4178e0d314292941d16c874..7abe5f87ab34b74c20746447a4436d5aa1cb8640 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -120,14 +120,12 @@ const struct iwl_mac_cfg iwl9000_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_9000,
        .base_params = &iwl9000_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
 };
 
 const struct iwl_mac_cfg iwl9560_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_9000,
        .base_params = &iwl9000_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .integrated = true,
        .xtal_latency = 650,
 };
@@ -136,7 +134,6 @@ const struct iwl_mac_cfg iwl9560_long_latency_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_9000,
        .base_params = &iwl9000_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .integrated = true,
        .xtal_latency = 2820,
 };
@@ -145,7 +142,6 @@ const struct iwl_mac_cfg iwl9560_shared_clk_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_9000,
        .base_params = &iwl9000_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .integrated = true,
        .xtal_latency = 670,
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
index d78f8ecaf133acfd4134b18614fd1040901951b0..067252ef9c943e87dc097954269eb282e2213f33 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
@@ -118,7 +118,6 @@ static const struct iwl_base_params iwl_ax210_base_params = {
 
 const struct iwl_mac_cfg iwl_so_mac_cfg = {
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .device_family = IWL_DEVICE_FAMILY_AX210,
        .base_params = &iwl_ax210_base_params,
@@ -131,7 +130,6 @@ const struct iwl_mac_cfg iwl_so_mac_cfg = {
 
 const struct iwl_mac_cfg iwl_so_long_latency_mac_cfg = {
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .device_family = IWL_DEVICE_FAMILY_AX210,
        .base_params = &iwl_ax210_base_params,
@@ -144,7 +142,6 @@ const struct iwl_mac_cfg iwl_so_long_latency_mac_cfg = {
 
 const struct iwl_mac_cfg iwl_so_long_latency_imr_mac_cfg = {
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .device_family = IWL_DEVICE_FAMILY_AX210,
        .base_params = &iwl_ax210_base_params,
@@ -170,7 +167,6 @@ const struct iwl_mac_cfg iwl_ma_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_AX210,
        .base_params = &iwl_ax210_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .integrated = true,
        .umac_prph_offset = 0x300000

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
index 61ba92cac37ce0e9dbb9a21fbe9b740ef2b04d9c..a8fe9244a818b9a377c88329d3fbe0cc5abaa356 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
@@ -127,7 +127,6 @@ const struct iwl_mac_cfg iwl_bz_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_BZ,
        .base_params = &iwl_bz_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .integrated = true,
        .umac_prph_offset = 0x300000,
@@ -140,7 +139,6 @@ const struct iwl_mac_cfg iwl_gl_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_BZ,
        .base_params = &iwl_bz_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .umac_prph_offset = 0x300000,
        .xtal_latency = 12000,

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
index 9b1ae8de75296dc060b9d8d90d900d2980615f4c..a258f49b8325e8839d91660a982787e3561c36b4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
@@ -123,7 +123,6 @@ const struct iwl_mac_cfg iwl_dr_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_DR,
        .base_params = &iwl_dr_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .integrated = true,
        .umac_prph_offset = 0x300000,
@@ -142,7 +141,6 @@ const struct iwl_mac_cfg iwl_br_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_DR,
        .base_params = &iwl_dr_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .umac_prph_offset = 0x300000,
        .xtal_latency = 12000,

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
index d06e15a5a9d741de630d843783e691857a58dfb8..4786a7714f6e5c7612a3bd03f01f5b7d5ab57d1f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
@@ -127,7 +127,6 @@ const struct iwl_mac_cfg iwl_sc_mac_cfg = {
        .device_family = IWL_DEVICE_FAMILY_SC,
        .base_params = &iwl_sc_base_params,
        .mq_rx_supported = true,
-       .rf_id = true,
        .gen2 = true,
        .integrated = true,
        .umac_prph_offset = 0x300000,

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 85afdff0cc98aeff534bb7395b9897dbacc53289..dfbca1ac34a478aaaf9d5982f07140a1817ac8df 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -258,7 +258,6 @@ enum iwl_mac_cfg_ltr_delay {
  * @umac_prph_offset: offset to add to UMAC periphery address
  * @xtal_latency: power up latency to get the xtal stabilized
  * @extra_phy_cfg_flags: extra configuration flags to pass to the PHY
- * @rf_id: need to read rf_id to determine the firmware image
  * @gen2: 22000 and on transport operation
  * @mq_rx_supported: multi-queue rx support
  * @integrated: discrete or integrated
@@ -273,8 +272,7 @@ struct iwl_mac_cfg {
        u32 umac_prph_offset;
        u32 xtal_latency;
        u32 extra_phy_cfg_flags;
-       u32 rf_id:1,
-           gen2:1,
+       u32 gen2:1,
            mq_rx_supported:1,
            integrated:1,
            low_latency_xtal:1,

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index b3eb6ceb4648a5f788e17eaa32f2b42b65977c1b..45a62733b28a7773ce56c5b211f9cce44ec587c0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1812,8 +1812,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         * extract the RF_ID.
         * This is relevant only for family 9000 and up.
         */
-       if (iwl_trans->mac_cfg->rf_id &&
-           iwl_trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 &&
+       if (iwl_trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 &&
            !CSR_HW_RFID_TYPE(info.hw_rf_id) && map_crf_id(iwl_trans, &info)) {
                ret = -EINVAL;
                goto out_free_trans;