iwlwifi: remove ACPI_SAR_NUM_TABLES definition

This definition was only used to pass the size of the tables in the FW
API to the iwl_sar_select_profile() function, but we should actually
pass the definition from the FW API file.  We don't have the concept
of tables in the ACPI definition, so we can remove it.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210805130823.00b5084be918.I18efb3c45bffacfa9a356c2c8d34e5ffbb3eb423@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
index cd26a155baf75f9685ce155440ee7f778ac044b2..245f0646c8f82a07060de8cf05df80ee05b0b6aa 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
@@ -34,7 +34,6 @@
 
 #define ACPI_SAR_NUM_CHAINS            2
 #define ACPI_SAR_NUM_SUB_BANDS         5
-#define ACPI_SAR_NUM_TABLES            1
 
 #define ACPI_WRDS_WIFI_DATA_SIZE       (ACPI_SAR_NUM_CHAINS * \
                                         ACPI_SAR_NUM_SUB_BANDS + 2)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 38fd5886af2d2a37e3c9c7514f04dda35957d13c..0b769aac0b02a395c0bfa10653a781e0bbf38ea6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -743,7 +743,8 @@ int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm, int prof_a, int prof_b)
        /* all structs have the same common part, add it */
        len += sizeof(cmd.common);
 
-       ret = iwl_sar_select_profile(&mvm->fwrt, per_chain, ACPI_SAR_NUM_TABLES,
+       ret = iwl_sar_select_profile(&mvm->fwrt, per_chain,
+                                    IWL_NUM_CHAIN_TABLES,
                                     n_subbands, prof_a, prof_b);
 
        /* return on error or if the profile is disabled (positive number) */