From 1c73acf58bd63a5dcc38132cd3060efbeae4a9ef Mon Sep 17 00:00:00 2001 From: Luca Coelho Date: Thu, 21 Sep 2017 11:02:45 +0300 Subject: iwlwifi: acpi: move ACPI method definitions to acpi.h Instead of defining each method where they are used and re-defining WIFI_DOMAIN in each one of them, move all the definitions to a central place and define the domain only a single time. Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c') diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 5165af25f010..2ece3c531b88 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -946,10 +946,6 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, IWL_EXPORT_SYMBOL(iwl_parse_nvm_mcc_info); #ifdef CONFIG_ACPI -#define WRDD_METHOD "WRDD" -#define WRDD_WIFI (0x07) -#define WRDD_WIGIG (0x10) - static u32 iwl_wrdd_get_mcc(struct device *dev, union acpi_object *wrdd) { union acpi_object *mcc_pkg, *domain_type, *mcc_value; @@ -975,7 +971,7 @@ static u32 iwl_wrdd_get_mcc(struct device *dev, union acpi_object *wrdd) } domain_type = &mcc_pkg->package.elements[0]; - if (domain_type->integer.value == WRDD_WIFI) + if (domain_type->integer.value == ACPI_WIFI_DOMAIN) break; mcc_pkg = NULL; @@ -994,7 +990,7 @@ int iwl_get_bios_mcc(struct device *dev, char *mcc) union acpi_object *data; u32 mcc_val; - data = iwl_acpi_get_object(dev, WRDD_METHOD); + data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD); if (IS_ERR(data)) return PTR_ERR(data); -- cgit v1.2.3