UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Luca Coelho 2017-09-26 16:13:23 +03:00
parent ed1a962db7
commit d953cdb8ee
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
View File

@ -684,7 +684,6 @@ enum iwl_mvm_queue_status {
#define IWL_MVM_NUM_CIPHERS 10
#ifdef CONFIG_ACPI
struct iwl_mvm_sar_profile {
bool enabled;
u8 table[ACPI_SAR_TABLE_SIZE];
@ -693,7 +692,6 @@ struct iwl_mvm_sar_profile {
struct iwl_mvm_geo_profile {
u8 values[ACPI_GEO_TABLE_SIZE];
};
#endif
struct iwl_mvm {
/* for logger access */

6
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
View File

@ -587,8 +587,6 @@ static const struct pci_device_id 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)
{
union acpi_object *data, *wifi_pkg;
@ -611,10 +609,6 @@ out:
kfree(data);
}
#else /* CONFIG_ACPI */
static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev) {}
#endif
/* PCI registers */
#define PCI_CFG_RETRY_TIMEOUT 0x041