Skip to content

Commit 8b48463

Browse files
Lv Zhengrafaeljw
Lv Zheng
authored and
rafaeljw
committed
ACPI: Clean up inclusions of ACPI header files
Replace direct inclusions of <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions and remove some inclusions of those files that aren't necessary. First of all, <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> should not be included directly from any files that are built for CONFIG_ACPI unset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. For CONFIG_ACPI set, <linux/acpi.h> includes those files and for CONFIG_ACPI unset it provides stub ACPI symbols to be used in that case. Second, there are ordering dependencies between those files that always have to be met. Namely, it is required that <acpi/acpi_bus.h> be included prior to <acpi/acpi_drivers.h> so that the acpi_pci_root declarations the latter depends on are always there. And <acpi/acpi.h> which provides basic ACPICA type declarations should always be included prior to any other ACPI headers in CONFIG_ACPI builds. That also is taken care of including <linux/acpi.h> as appropriate. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Tony Luck <tony.luck@intel.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> (drivers/pci stuff) Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> (Xen stuff) Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 6ce4eac commit 8b48463

103 files changed

Lines changed: 80 additions & 234 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/ia64/hp/common/aml_nfw.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
*/
2424

2525
#include <linux/module.h>
26-
#include <acpi/acpi_bus.h>
27-
#include <acpi/acpi_drivers.h>
26+
#include <linux/acpi.h>
2827
#include <asm/sal.h>
2928

3029
MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>");

‎arch/x86/kernel/apic/apic_flat_64.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
#include <asm/apic.h>
2222
#include <asm/ipi.h>
2323

24-
#ifdef CONFIG_ACPI
25-
#include <acpi/acpi_bus.h>
26-
#endif
24+
#include <linux/acpi.h>
2725

2826
static struct apic apic_physflat;
2927
static struct apic apic_flat;

‎arch/x86/kernel/apic/io_apic.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
#include <linux/kthread.h>
3838
#include <linux/jiffies.h> /* time_after() */
3939
#include <linux/slab.h>
40-
#ifdef CONFIG_ACPI
41-
#include <acpi/acpi_bus.h>
42-
#endif
4340
#include <linux/bootmem.h>
4441
#include <linux/dmar.h>
4542
#include <linux/hpet.h>

‎arch/x86/pci/mmconfig_32.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/rcupdate.h>
1515
#include <asm/e820.h>
1616
#include <asm/pci_x86.h>
17-
#include <acpi/acpi.h>
1817

1918
/* Assume systems with more busses have correct MCFG */
2019
#define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))

‎arch/x86/platform/olpc/olpc-xo15-sci.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
#include <linux/power_supply.h>
1616
#include <linux/olpc-ec.h>
1717

18-
#include <acpi/acpi_bus.h>
19-
#include <acpi/acpi_drivers.h>
18+
#include <linux/acpi.h>
2019
#include <asm/olpc.h>
2120

2221
#define DRV_NAME "olpc-xo15-sci"

‎drivers/acpi/ac.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#include <linux/delay.h>
3333
#include <linux/platform_device.h>
3434
#include <linux/power_supply.h>
35-
#include <acpi/acpi_bus.h>
36-
#include <acpi/acpi_drivers.h>
35+
#include <linux/acpi.h>
3736

3837
#define PREFIX "ACPI: "
3938

‎drivers/acpi/acpi_extlog.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <linux/module.h>
1111
#include <linux/acpi.h>
12-
#include <acpi/acpi_bus.h>
1312
#include <linux/cper.h>
1413
#include <linux/ratelimit.h>
1514
#include <asm/cpu.h>

‎drivers/acpi/acpi_pad.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
#include <linux/cpu.h>
2929
#include <linux/clockchips.h>
3030
#include <linux/slab.h>
31-
#include <acpi/acpi_bus.h>
32-
#include <acpi/acpi_drivers.h>
31+
#include <linux/acpi.h>
3332
#include <asm/mwait.h>
3433

3534
#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"

‎drivers/acpi/apei/einj.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include <linux/nmi.h>
3434
#include <linux/delay.h>
3535
#include <linux/mm.h>
36-
#include <acpi/acpi.h>
3736

3837
#include "apei-internal.h"
3938

‎drivers/acpi/battery.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
#include <linux/suspend.h>
3737
#include <asm/unaligned.h>
3838

39-
#include <acpi/acpi_bus.h>
40-
#include <acpi/acpi_drivers.h>
39+
#include <linux/acpi.h>
4140
#include <linux/power_supply.h>
4241

4342
#define PREFIX "ACPI: "

0 commit comments

Comments
 (0)