Commit d953cdb8 authored by Luca Coelho's avatar Luca Coelho

iwlwifi: acpi: remove a couple of unnecessary ifdefs

Some of the #ifdef CONFIG_ACPI are not needed anymore, so they can be
removed.
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent ed1a962d
...@@ -684,7 +684,6 @@ enum iwl_mvm_queue_status { ...@@ -684,7 +684,6 @@ enum iwl_mvm_queue_status {
#define IWL_MVM_NUM_CIPHERS 10 #define IWL_MVM_NUM_CIPHERS 10
#ifdef CONFIG_ACPI
struct iwl_mvm_sar_profile { struct iwl_mvm_sar_profile {
bool enabled; bool enabled;
u8 table[ACPI_SAR_TABLE_SIZE]; u8 table[ACPI_SAR_TABLE_SIZE];
...@@ -693,7 +692,6 @@ struct iwl_mvm_sar_profile { ...@@ -693,7 +692,6 @@ struct iwl_mvm_sar_profile {
struct iwl_mvm_geo_profile { struct iwl_mvm_geo_profile {
u8 values[ACPI_GEO_TABLE_SIZE]; u8 values[ACPI_GEO_TABLE_SIZE];
}; };
#endif
struct iwl_mvm { struct iwl_mvm {
/* for logger access */ /* for logger access */
......
...@@ -587,8 +587,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = { ...@@ -587,8 +587,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
}; };
MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids); MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
#ifdef CONFIG_ACPI
static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev) static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev)
{ {
union acpi_object *data, *wifi_pkg; union acpi_object *data, *wifi_pkg;
...@@ -611,10 +609,6 @@ static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev) ...@@ -611,10 +609,6 @@ static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev)
kfree(data); kfree(data);
} }
#else /* CONFIG_ACPI */
static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev) {}
#endif
/* PCI registers */ /* PCI registers */
#define PCI_CFG_RETRY_TIMEOUT 0x041 #define PCI_CFG_RETRY_TIMEOUT 0x041
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment