Commit 8b48463f authored Dec 03, 2013 by Lv Zheng Committed by Rafael J. Wysocki Dec 07, 2013

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>

parent 6ce4eac1

arch/ia64/hp/common/aml_nfw.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,7 @@
		*/

		#include <linux/module.h>
		#include <acpi/acpi_bus.h>
		#include <acpi/acpi_drivers.h>
		#include <linux/acpi.h>
		#include <asm/sal.h>

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

arch/x86/kernel/apic/apic_flat_64.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,7 @@
		#include <asm/apic.h>
		#include <asm/ipi.h>

		#ifdef CONFIG_ACPI
		#include <acpi/acpi_bus.h>
		#endif
		#include <linux/acpi.h>

		static struct apic apic_physflat;
		static struct apic apic_flat;

arch/x86/kernel/apic/io_apic.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -37,9 +37,6 @@
		#include <linux/kthread.h>
		#include <linux/jiffies.h> /* time_after() */
		#include <linux/slab.h>
		#ifdef CONFIG_ACPI
		#include <acpi/acpi_bus.h>
		#endif
		#include <linux/bootmem.h>
		#include <linux/dmar.h>
		#include <linux/hpet.h>

arch/x86/pci/mmconfig_32.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		#include <linux/rcupdate.h>
		#include <asm/e820.h>
		#include <asm/pci_x86.h>
		#include <acpi/acpi.h>

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

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,7 @@
		#include <linux/power_supply.h>
		#include <linux/olpc-ec.h>

		#include <acpi/acpi_bus.h>
		#include <acpi/acpi_drivers.h>
		#include <linux/acpi.h>
		#include <asm/olpc.h>

		#define DRV_NAME "olpc-xo15-sci"