diff options
author | Hanjun Guo <hanjun.guo@linaro.org> | 2014-05-05 23:24:30 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-06 19:09:47 -0400 |
commit | 6b90f55f63c75c2c65454aea6703c2ea91b9e372 (patch) | |
tree | a2890c43b856d5d4fe82c4b1ce0ba278b33e02be | |
parent | 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd (diff) |
ACPI / PCI: Stub out pci_acpi_crs_quirks() and make it x86 specific
For pci_acpi_crs_quirks(), ia64 already doesn't use it, and we can
not foresee it should be used in ARM64, so stub out pci_acpi_crs_quirks()
to avoid introducing platform specific dummy stub function.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | arch/ia64/include/asm/acpi.h | 1 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index d651102a4d45..97cb16086314 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h | |||
@@ -92,7 +92,6 @@ ia64_acpi_release_global_lock (unsigned int *lock) | |||
92 | #endif | 92 | #endif |
93 | #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ | 93 | #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ |
94 | static inline void disable_acpi(void) { } | 94 | static inline void disable_acpi(void) { } |
95 | static inline void pci_acpi_crs_quirks(void) { } | ||
96 | 95 | ||
97 | #ifdef CONFIG_IA64_GENERIC | 96 | #ifdef CONFIG_IA64_GENERIC |
98 | const char *acpi_get_sysname (void); | 97 | const char *acpi_get_sysname (void); |
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index d504613bbf80..ea6428b7dacb 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -96,7 +96,12 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle); | |||
96 | /* Arch-defined function to add a bus to the system */ | 96 | /* Arch-defined function to add a bus to the system */ |
97 | 97 | ||
98 | struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root); | 98 | struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root); |
99 | |||
100 | #ifdef CONFIG_X86 | ||
99 | void pci_acpi_crs_quirks(void); | 101 | void pci_acpi_crs_quirks(void); |
102 | #else | ||
103 | static inline void pci_acpi_crs_quirks(void) { } | ||
104 | #endif | ||
100 | 105 | ||
101 | /* -------------------------------------------------------------------------- | 106 | /* -------------------------------------------------------------------------- |
102 | Processor | 107 | Processor |