ACPI: Cleanup header inclusions.
Subsystems (35)
cover ACPI: Cleanup header inclusions.
From: Lv Zheng <[email protected]>
ACPICA header files are lacking in stub protections. This makes all ACPICA header files could only be included for CONFIG_ACPI=y environment. This infects new ACPI prototypes, if such prototypes referenced ACPICA defined types, they must be incldued only in the CONFIG_ACPI=y environment. The <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> are the monstrosity infants born under this background, directly including them in the CONFIG_ACPI=n environment is not safe. The infection spreads to whole kernel source tree that we can see "#ifdef CONFIG_ACPI" here and there.
This patchset tries to enforces <linux/acpi.h> inclusions instead of <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
Lv Zheng (4):
ACPICA: Linux: Cleanup wrong ACPICA inclusions.
ACPI: Cleanup <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
ACPICA: Cleanup <acpi/acpi.h> inclusions.
ACPI: Add support to force header inclusion rules for <linux/acpi.h>.
arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 3 +-- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/nvs.c | 1 - drivers/acpi/osl.c | 2 -- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 3 +-- drivers/acpi/pci_root.c | 2 -- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 3 +-- drivers/acpi/processor_core.c | 2 +- drivers/acpi/processor_idle.c | 1 - drivers/acpi/processor_perflib.c | 3 +-- drivers/acpi/processor_thermal.c | 3 +-- drivers/acpi/processor_throttling.c | 3 +-- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 1 - drivers/acpi/sleep.c | 2 -- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 3 +-- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 3 +-- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 1 - drivers/ata/pata_acpi.c | 2 +- drivers/char/hpet.c | 1 - drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 1 - drivers/gpu/drm/nouveau/nouveau_acpi.c | 3 --- drivers/gpu/drm/radeon/radeon_acpi.c | 2 -- drivers/hv/vmbus_drv.c | 1 - drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 5 +---- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 2 +- drivers/pci/hotplug/acpiphp_ibm.c | 1 - drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 2 -- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 1 - drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 2 +- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 3 +-- drivers/platform/x86/intel_oaktrail.c | 2 -- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 3 +-- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 2 -- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/toshiba_acpi.c | 2 +- drivers/platform/x86/toshiba_bluetooth.c | 3 +-- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 2 +- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 2 -- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 3 +-- drivers/xen/xen-acpi-processor.c | 3 +-- include/acpi/acpi_bus.h | 6 +++++- include/acpi/acpi_drivers.h | 7 +++++-- include/acpi/platform/aclinux.h | 6 ++++++ include/linux/acpi_io.h | 2 +- include/linux/ide.h | 3 --- include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 3 +-- 106 files changed, 75 insertions(+), 166 deletions(-)
Signature · 1 line
1.7.10
PATCH 1/4 ACPICA: Linux: Cleanup wrong ACPICA inclusions.
From: Lv Zheng <[email protected]>
The header file <acpi/acpi.h> is the top level header for other kernel subsystems to include. It contains environemnt settings and architecture specific implementation that should be included before including other ACPICA headers in order to keep a consistent build environment for ACPICA users. All following internal ACPICA header files thus should be included from <acpi/acpi.h> and not included by other kernel files:
<acpi/acnames.h>
<acpi/actypes.h>
<acpi/acexcep.h>
<acpi/acexcep.h>
<acpi/acoutput.h>
<acpi/acrestyp.h>
<acpi/acpiosxf.h>
<acpi/acpixf.h>
<acpi/acconfig.h>: included by <acpi/acpixf.h> <acpi/acconfig.h>
<acpi/actbl.h>
<acpi/actbl1.h>: included by <acpi/actbl.h>
<acpi/actbl2.h>: included by <acpi/actbl.h>
<acpi/actbl3.h>: included by <acpi/actbl.h> <acpi/platform/acenv.h>
<acpi/platform/aclinux.h>: included by <acpi/platform/acenv.h>
This patch cleans up inclusions of above files from non ACPICA source files.
Signed-off-by Lv Zheng <[email protected]>
--- drivers/acpi/nvs.c | 1 - drivers/hwmon/asus_atk0110.c | 1 - 2 files changed, 2 deletions(-)
drivers/acpi/nvs.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/acpi.h> #include <linux/acpi_io.h> -#include <acpi/acpiosxf.h> /* ACPI NVS regions, APEI may use it */
drivers/hwmon/asus_atk0110.c +0 -1
@@ -18,7 +18,6 @@#include <linux/err.h> #include <acpi/acpi.h> -#include <acpi/acpixf.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h>
Signature · 1 line
1.7.10
Re: [PATCH 1/4] ACPICA: Linux: Cleanup wrong ACPICA inclusions.
Quoted 27 lines · Lv Zheng
From: Lv Zheng <[email protected]>
The header file <
acpi/acpi.h> is the top level header for other kernel subsystems to include. It contains environemnt settings and architecture specific implementation that should be included before including other ACPICA headers in order to keep a consistent build environment for ACPICA users. All following internal ACPICA header files thus should be included from <acpi/acpi.h> and not included by other kernel files:
<acpi/acnames.h>
<acpi/actypes.h>
<acpi/acexcep.h>
<acpi/acexcep.h>
<acpi/acoutput.h>
<acpi/acrestyp.h>
<acpi/acpiosxf.h>
<acpi/acpixf.h>
<acpi/acconfig.h>: included by <acpi/acpixf.h> <acpi/acconfig.h>
<acpi/actbl.h>
<acpi/actbl1.h>: included by <acpi/actbl.h>
<acpi/actbl2.h>: included by <acpi/actbl.h>
<acpi/actbl3.h>: included by <acpi/actbl.h> <acpi/platform/acenv.h>
<acpi/platform/aclinux.h>: included by <acpi/platform/acenv.h>
This patch cleans up inclusions of above files from non ACPICA source files.
Quoted 1 line
Signed-off-by Lv Zheng <[email protected]>
Applied with slightly modified subject/changelog.
Thanks!
Quoted 30 lines
--- drivers/acpi/nvs.c | 1 - drivers/hwmon/asus_atk0110.c | 1 - 2 files changed, 2 deletions(-)drivers/acpi/nvs.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/acpi.h> #include <linux/acpi_io.h> -#include <acpi/acpiosxf.h> /* ACPI NVS regions, APEI may use it */ drivers/hwmon/asus_atk0110.c +0
-1@@ -18,7 +18,6 @@#include <linux/err.h> #include <acpi/acpi.h> -#include <acpi/acpixf.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h>
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
PATCH 2/4 ACPI: Cleanup <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Lv ZhengFrom: Lv Zheng <[email protected]>
This patch enfoces <linux/acpi.h> inclusion instead of direct <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> inclusions.
It's required that <acpi/acpi_bus.h> included prior than <acpi/acpi_drivers.h> to find declarations for acpi_pci_root. It is required that <acpi/acpi.h> included prior than <acpi/acpi_drivers.h> to find declarations for acpi_handle and acpi_notify_handler.
In order to work around this, there are <linux/acpi.h> and <acpi/acpi_bus.h> inclusions in the <acpi/acpi_drivers.h>.
This messes up the inclusion order in the following style:
+--<acpi/acpi_drivers.h> | | +--<linux/acpi.h> | | | | +--<acpi/acpi.h> if CONFIG_ACPI=y | | | | | +->Included if CONFIG_ACPI=y | | | | +--<acpi/acpi_bus.h> if CONFIG_ACPI=y | | | | | | +--<acpi/acpi.h> if CONFIG_ACPI=y and CONFIG_ACPI=n | | | | | | | +->Excluded | | | | | +->Included if CONFIG_ACPI=y | | | | +--<acpi/acpi_drivers.h> if CONFIG_ACPI=y | | | | | +->Excluded | | | +->Included if CONFIG_ACPI=y and CONFIG_ACPI=n | | +--<acpi/acpi_bus.h> | | | | +--<acpi/acpi.h> if CONFIG_ACPI=y and CONFIG_ACPI=n | | | | | +->Inlcuded if CONFIG_ACPI=n | | | +->Included if CONFIG_ACPI=n | +->Included if CONFIG_ACPI=y and CONFIG_ACPI=n
Figure 1. Current ACPI Headers Inclusion Order
When CONFIG_ACPI is disabled, the result inclusion order of "#include <acpi/acpi_drivers.h> turns out to be:
<linux/acpi.h>
<acpi/acpi.h>
<acpi/acpi_bus.h>
<acpi/acpi_drivers.h>
Figure 2. ACPI Headers Inclusion Order CONFIG_ACPI=n
When CONFIG_ACPI is enabled, the result inclusion order of "#include <acpi/acpi_drivers.h> turns out to be:
<acpi/acpi.h>
<acpi/acpi_bus.h>
<linux/acpi.h>
<acpi/acpi_drivers.h>
Figure 3. ACPI Headers Inclusion Order CONFIG_ACPI=n
In order to follow the type dependencies, the best order should be:
<acpi/acpi.h>
<acpi/acpi_bus.h>
<acpi/acpi_drivers.h> or <linux/acpi.h>
<linux/acpi.h> <acpi/acpi_drivers.h>
Figure 4. Best ACPI Headers Inclusion Order
By investigation, currently <acpi/acpi_drivers.h> are all included for CONFIG_ACPI=y, thus this is not a real issue but would prevent further header cleanup work from being achieved.
If we just include <linux/acpi.h> in the <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> to solve header inclusion order issue, it will easily form a wrong inclusion order, and a build test would end with the following error messages:
<stdin>:1220:2: warning: #warning syscall kcmp not implemented [-Wcpp] <stdin>:1223:2: warning: #warning syscall finit_module not implemented [-Wcpp] In file included from include/linux/acpi.h:38:0,
from include/acpi/acpi_bus.h:30,
from drivers/acpi/ac.c:35:
include/acpi/acpi_drivers.h:101:43: warning: 'struct acpi_pci_root' declared inside parameter list [enabled by default]
include/acpi/acpi_drivers.h:101:43: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
In file included from include/acpi/acpi_bus.h:30:0,
from drivers/acpi/ac.c:35:include/linux/acpi.h:272:7: warning: 'struct acpi_device' declared inside parameter list [enabled by default]
So this patch cleans up direct <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> inclusion by replacing them with <linux/acpi.h> inclusion and removing <linux/acpi.h> and <acpi/acpi_bus.h> inclusion from the <acpi/acpi_drivers.h> so that the inclusion order is:
<acpi/acpi.h>
<acpi/acpi_bus.h>
<acpi/acpi_drivers.h>
<linux/acpi.h>
Figure 5. ACPI Headers Inclusion Order CONFIG_ACPI=n
This matches best known ACPI header inclusion order in the Figure 4.
Note that, in some files that already include <linux/acpi.h>, this patch deletes <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> for them. If <linux/acpi.h> inclusion is after original <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> inclusions, it is moved up so that other ACPI header files are able to find the definitions of the ACPICA types.
Currently <acpi/acpi_bus.h> is used to put prototypes that are referencing ACPICA defined types. As such types are not safe for "#ifndef CONFIG_ACPI" code blocks, <linux/acpi.h> includes this file with "#ifdef CONFIG_ACPI" protections. Directly including <acpi/acpi_bus.h> should only apply to ACPI dependent code while such code can also include <linux/acpi.h>. This patch tries to replace <acpi/acpi_bus.h> inclusions with <linux/acpi.h> inclusions or delete <acpi/acpi_bus.h> inclusions if there is already <linux/acpi.h> included for such files. When deleting, we carefully put <linux/acpi.h> inclusions before any other ACPI header file inclusions so that they are able to find ACPICA defined types.
The actual cleanups are done in the following style:
1. CONFIG_ACPI dependent modules, where <linux/acpi.h> is already included. We could simply cleanup them by removing <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> inclusion.
2. Not CONFIG_ACPI dependent modules, where <linux/acpi.h> is already included. As there isn't code pieces surrounded by "#ifdef CONFIG_ACPI" we can simply cleanup them by removing <acpi/acpi_drivers.h> and <acpi/acpi_bus.h>.
3. CONFIG_ACPI dependent modules, where <linux/acpi.h> is not included. We can simply cleanup them by replacing <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> with <linux/acpi.h>.
4. CONFIG_ACPI enabled code, but only ACPICA types are referenced, we can simply cleanup them by replacing <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> with <acpi/acpi.h>. We carefully protect such inclusions with "#ifdef CONFIG_ACPI" undeleted.
Tests are done by enabling the modules listed in this patch, build the kernel with and without this patch applied. The build output with static checkers enabled shows only line number differences.
Signed-off-by Lv Zheng <[email protected]>
--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 3 +-- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 1 - drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 3 +-- drivers/acpi/pci_root.c | 2 -- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 3 +-- drivers/acpi/processor_core.c | 2 +- drivers/acpi/processor_idle.c | 1 - drivers/acpi/processor_perflib.c | 3 +-- drivers/acpi/processor_thermal.c | 3 +-- drivers/acpi/processor_throttling.c | 3 +-- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 1 - drivers/acpi/sleep.c | 2 -- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 3 +-- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 3 +-- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 1 - drivers/ata/pata_acpi.c | 2 +- drivers/char/hpet.c | 1 - drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 1 - drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 -- drivers/gpu/drm/radeon/radeon_acpi.c | 2 -- drivers/hv/vmbus_drv.c | 1 - drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 3 +-- drivers/input/misc/atlas_btns.c | 2 +- drivers/pci/hotplug/acpiphp_ibm.c | 1 - drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 1 - drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 1 - drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 2 +- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 3 +-- drivers/platform/x86/intel_oaktrail.c | 2 -- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 3 +-- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 2 -- drivers/platform/x86/tc1100-wmi.c | 3 +-- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/toshiba_acpi.c | 2 +- drivers/platform/x86/toshiba_bluetooth.c | 3 +-- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 2 -- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 3 +-- drivers/xen/xen-acpi-processor.c | 3 +-- include/acpi/acpi_bus.h | 1 - include/acpi/acpi_drivers.h | 2 -- include/linux/pci_hotplug.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 3 +-- 91 files changed, 51 insertions(+), 142 deletions(-)
arch/ia64/hp/common/aml_nfw.c +1 -2
@@ -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 <[email protected]>" );
arch/x86/kernel/apic/apic_flat_64.c +1 -3
@@ -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
@@ -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/platform/olpc/olpc-xo15-sci.c +1 -2
@@ -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"
drivers/acpi/ac.c +1 -2
@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/acpi_extlog.c +0 -1
@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h>
drivers/acpi/acpi_pad.c +1 -2
@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
drivers/acpi/battery.c +1 -2
@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "
drivers/acpi/blacklist.c +0 -1
@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h"
drivers/acpi/bus.c +0 -2
@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h>
drivers/acpi/button.c +1 -2
@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "
drivers/acpi/custom_method.c +1 -1
@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/debugfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );
drivers/acpi/dock.c +0 -2
@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/ec.c +1 -2
@@ -40,8 +40,7 @@#include <linux/spinlock.h> #include <linux/slab.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> #include "internal.h"
drivers/acpi/event.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h>
drivers/acpi/fan.c +1 -2
@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/hed.c +0 -2
@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {
drivers/acpi/numa.c +0 -1
@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "
drivers/acpi/osl.c +0 -1
@@ -50,7 +50,6 @@#include <asm/uaccess.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <acpi/processor.h> #include "internal.h"
drivers/acpi/pci_irq.c +0 -2
@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/pci_link.c +1 -2
@@ -40,8 +40,7 @@#include <linux/mutex.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/pci_root.c +0 -2
@@ -35,8 +35,6 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include "internal.h"
drivers/acpi/power.c +1 -2
@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h"
drivers/acpi/proc.c +1 -2
@@ -5,8 +5,7 @@#include <linux/bcd.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h"
drivers/acpi/processor_core.c +1 -1
@@ -11,7 +11,7 @@#include <linux/dmi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h"
drivers/acpi/processor_idle.c +0 -1
@@ -46,7 +46,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> #include <acpi/processor.h> #define PREFIX "ACPI: "
drivers/acpi/processor_perflib.c +1 -2
@@ -36,8 +36,7 @@#include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #define PREFIX "ACPI: "
drivers/acpi/processor_thermal.c +1 -2
@@ -33,9 +33,8 @@#include <asm/uaccess.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/processor_throttling.c +1 -2
@@ -36,8 +36,7 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #define PREFIX "ACPI: "
drivers/acpi/sbshc.c +1 -2
@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h>
drivers/acpi/scan.c +0 -1
@@ -12,7 +12,6 @@#include <linux/dmi.h> #include <linux/nls.h> -#include <acpi/acpi_drivers.h> #include "internal.h"
drivers/acpi/sleep.c +0 -2
@@ -21,8 +21,6 @@#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" #include "sleep.h"
drivers/acpi/sysfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/thermal.c +1 -2
@@ -43,8 +43,7 @@#include <linux/device.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/utils.c +0 -2
@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h"
drivers/acpi/video.c +1 -2
@@ -39,8 +39,7 @@#include <linux/slab.h> #include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/suspend.h> #include <acpi/video.h>
drivers/acpi/wakeup.c +0 -1
@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h>
drivers/ata/libata-acpi.c +0 -1
@@ -20,7 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 );
drivers/ata/pata_acpi.c +1 -1
@@ -13,7 +13,7 @@#include <linux/device.h> #include <linux/gfp.h> #include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h>
drivers/char/hpet.c +0 -1
@@ -40,7 +40,6 @@#include <asm/div64.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/hpet.h> /*
drivers/char/tpm/tpm_ppi.c +0 -1
@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {
drivers/gpu/drm/i915/intel_acpi.c +0 -1
@@ -6,7 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> #include <drm/drmP.h> #include "i915_drv.h"
drivers/gpu/drm/nouveau/nouveau_acpi.c +0 -2
@@ -1,8 +1,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> #include <acpi/video.h> #include <acpi/acpi.h> #include <linux/mxm-wmi.h>
drivers/gpu/drm/radeon/radeon_acpi.c +0 -2
@@ -25,8 +25,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> #include <acpi/video.h> #include <drm/drmP.h>
drivers/hv/vmbus_drv.c +0 -1
@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h>
drivers/hwmon/acpi_power_meter.c +1 -2
@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );
drivers/hwmon/asus_atk0110.c +1 -2
@@ -18,8 +18,7 @@#include <linux/err.h> #include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ATK_HID "ATK0110"
drivers/input/misc/atlas_btns.c +1 -1
@@ -29,7 +29,7 @@#include <linux/input.h> #include <linux/types.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"
drivers/pci/hotplug/acpiphp_ibm.c +0 -1
@@ -31,7 +31,6 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> #include <asm/uaccess.h>
drivers/pci/hotplug/pciehp.h +0 -1
@@ -164,7 +164,6 @@ static inline const char *slot_name(struct slot *slot)#ifdef CONFIG_ACPI #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );
drivers/pci/ioapic.c +0 -1
@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;
drivers/pci/pci-acpi.c +0 -1
@@ -13,7 +13,6 @@#include <linux/module.h> #include <linux/pci-aspm.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> #include <linux/pm_runtime.h>
drivers/pci/pci-label.c +0 -1
@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07
drivers/platform/x86/acer-wmi.c +0 -1
@@ -42,7 +42,6 @@#include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/asus-laptop.c +1 -2
@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"
drivers/platform/x86/asus-wmi.c +1 -2
@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h"
drivers/platform/x86/classmate-laptop.c +1 -1
@@ -21,7 +21,7 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h>
drivers/platform/x86/dell-wmi-aio.c +0 -1
@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h>
drivers/platform/x86/dell-wmi.c +0 -1
@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h>
drivers/platform/x86/eeepc-laptop.c +1 -2
@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h>
drivers/platform/x86/eeepc-wmi.c +1 -1
@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h"
drivers/platform/x86/hp_accel.c +1 -1
@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"
drivers/platform/x86/ideapad-laptop.c +1 -2
@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/platform/x86/intel-rst.c +1 -1
@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel-smartconnect.c +1 -1
@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel_menlow.c +1 -2
@@ -38,8 +38,7 @@#include <linux/pm.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );
drivers/platform/x86/intel_oaktrail.c +0 -2
@@ -50,8 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define DRIVER_NAME "intel_oaktrail"
drivers/platform/x86/mxm-wmi.c +1 -2
@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );
drivers/platform/x86/panasonic-laptop.c +1 -2
@@ -125,8 +125,7 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h>
drivers/platform/x86/pvpanic.c +1 -2
@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );
drivers/platform/x86/samsung-q10.c +1 -1
@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7
drivers/platform/x86/sony-laptop.c +0 -2
@@ -61,8 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> #include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h>
drivers/platform/x86/tc1100-wmi.c +1 -2
@@ -33,8 +33,7 @@#include <linux/init.h> #include <linux/types.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"
drivers/platform/x86/thinkpad_acpi.c +1 -1
@@ -84,7 +84,7 @@#include <sound/control.h> #include <sound/initval.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/pci_ids.h>
drivers/platform/x86/toshiba_acpi.c +1 -1
@@ -57,7 +57,7 @@#include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );
drivers/platform/x86/toshiba_bluetooth.c +1 -2
@@ -23,8 +23,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );
drivers/platform/x86/wmi.c +0 -2
@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/xo15-ebook.c +1 -2
@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"
drivers/pnp/pnpacpi/core.c +0 -1
@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h"
drivers/pnp/pnpacpi/pnpacpi.h +0 -1
@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h>
drivers/staging/quickstart/quickstart.c +1 -1
@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/usb/core/usb-acpi.c +0 -1
@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h"
drivers/xen/xen-acpi-cpuhotplug.c +0 -2
@@ -24,8 +24,6 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> #include <xen/acpi.h>
drivers/xen/xen-acpi-memhotplug.c +0 -1
@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
drivers/xen/xen-acpi-pad.c +1 -2
@@ -18,8 +18,7 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/xen/hypercall.h> #include <xen/interface/version.h> #include <xen/xen-ops.h>
drivers/xen/xen-acpi-processor.c +1 -2
@@ -28,8 +28,7 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include <xen/xen.h>
include/acpi/acpi_bus.h +0 -1
@@ -28,7 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> /* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10
include/acpi/acpi_drivers.h +0 -2
@@ -26,8 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> #define ACPI_MAX_STRING 80
include/linux/pci_hotplug.h +1 -1
@@ -176,7 +176,7 @@ struct hotplug_params {#ifdef CONFIG_ACPI #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);
tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1 -2
@@ -28,8 +28,7 @@#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> static int pm_tmr_ioport =0 ;
Signature · 1 line
1.7.10
Re: [PATCH 2/4] ACPI: Cleanup <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
Quoted 4 lines · Lv Zheng
From: Lv Zheng <[email protected]>
This patch enfoces <
linux/acpi.h> inclusion instead of direct <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> inclusions.
First off, please make the changelog shorter. Here's my version:
"Replace direct inclusions of <acpi/acpi_drivers.h> and <acpi/acpi_bus.h>, which are incorrect, with <linux/acpi.h> inclusions.
First of all, <acpi/acpi_drivers.h> and <acpi/acpi_bus.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 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. That also is taken care of including <linux/acpi.h> as appropriate."
Second, please fold [3/4] into this one. Keeping them separate is artificial and pointless in my opinion. [Of course, the changelog will have to be modified then.]
[...]
Apart from the above ->
Quoted 289 lines
Signed-off-by Lv Zheng <[email protected]>--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 3 +-- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 1 - drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 3 +-- drivers/acpi/pci_root.c | 2 -- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 3 +-- drivers/acpi/processor_core.c | 2 +- drivers/acpi/processor_idle.c | 1 - drivers/acpi/processor_perflib.c | 3 +-- drivers/acpi/processor_thermal.c | 3 +-- drivers/acpi/processor_throttling.c | 3 +-- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 1 - drivers/acpi/sleep.c | 2 -- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 3 +-- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 3 +-- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 1 - drivers/ata/pata_acpi.c | 2 +- drivers/char/hpet.c | 1 - drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 1 - drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 -- drivers/gpu/drm/radeon/radeon_acpi.c | 2 -- drivers/hv/vmbus_drv.c | 1 - drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 3 +-- drivers/input/misc/atlas_btns.c | 2 +- drivers/pci/hotplug/acpiphp_ibm.c | 1 - drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 1 - drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 1 - drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 2 +- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 3 +-- drivers/platform/x86/intel_oaktrail.c | 2 -- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 3 +-- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 2 -- drivers/platform/x86/tc1100-wmi.c | 3 +-- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/toshiba_acpi.c | 2 +- drivers/platform/x86/toshiba_bluetooth.c | 3 +-- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 2 -- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 3 +-- drivers/xen/xen-acpi-processor.c | 3 +-- include/acpi/acpi_bus.h | 1 - include/acpi/acpi_drivers.h | 2 -- include/linux/pci_hotplug.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 3 +-- 91 files changed, 51 insertions(+), 142 deletions(-)arch/ia64/hp/common/aml_nfw.c +1
-2@@ -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 <[email protected]>" );arch/x86/kernel/apic/apic_flat_64.c +1
-3@@ -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@@ -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/platform/olpc/olpc-xo15-sci.c +1
-2@@ -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"drivers/acpi/ac.c +1
-2@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/acpi_extlog.c +0
-1@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> drivers/acpi/acpi_pad.c +1
-2@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"drivers/acpi/battery.c +1
-2@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "drivers/acpi/blacklist.c +0
-1@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" drivers/acpi/bus.c +0
-2@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> drivers/acpi/button.c +1
-2@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "drivers/acpi/custom_method.c +1
-1@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/debugfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );drivers/acpi/dock.c +0
-2@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/ec.c +0
-0
drivers/acpi/ec.c line 43
Quoted 6 lines
drivers/acpi/ec.c +1
-2@@ -40,8 +40,7 @@#include <linux/spinlock.h> #include <linux/slab.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h>
-> add the new #include above the <asm/io.h> maybe?
Quoted 60 lines
drivers/acpi/ec.c +0
-0#include <linux/dmi.h> #include "internal.h" drivers/acpi/event.c +1
-1@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> drivers/acpi/fan.c +1
-2@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/hed.c +0
-2@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {drivers/acpi/numa.c +0
-1@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "drivers/acpi/osl.c +0
-0
drivers/acpi/osl.c line 53
Quoted 5 lines
drivers/acpi/osl.c +0
-1@@ -50,7 +50,6 @@#include <asm/uaccess.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <acpi/processor.h>
-> I guess all of these <acpi/...> inclusions may go away from here?
Quoted 20 lines
drivers/acpi/osl.c +0
-0#include "internal.h" drivers/acpi/pci_irq.c +0
-2@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/pci_link.c +0
-0
drivers/acpi/pci_link.c line 42
Quoted 3 lines
drivers/acpi/pci_link.c +0
-0@@ -40,8 +40,7 @@#include <linux/mutex.h> #include <linux/slab.h>
-> Remove the empty line too.
Quoted 11 lines
drivers/acpi/pci_link.c +1
-2-#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +0
-0
drivers/acpi/pci_root.c line 38
Quoted 6 lines
drivers/acpi/pci_root.c +0
-2@@ -35,8 +35,6 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h>
Does <acpi/apei.h> have to be included directly here? If not, please remove it too.
Quoted 21 lines
drivers/acpi/pci_root.c +0
-0#include "internal.h" drivers/acpi/power.c +1
-2@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" drivers/acpi/proc.c +0
-0
drivers/acpi/proc.c line 8
Quoted 6 lines
drivers/acpi/proc.c +1
-2@@ -5,8 +5,7 @@#include <linux/bcd.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h>
-> Put the new line above the <asm/uaccess.h>
Quoted 8 lines
drivers/acpi/proc.c +0
-0#include "sleep.h" drivers/acpi/processor_core.c +0
-0
drivers/acpi/processor_core.c line 15
Quoted 6 lines
drivers/acpi/processor_core.c +1
-1@@ -11,7 +11,7 @@#include <linux/dmi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h>
-> Remove the useless empty line and processor.h inclusion too.
drivers/acpi/processor_idle.c line 49
Quoted 12 lines
drivers/acpi/processor_core.c +0
-0#include "internal.h" drivers/acpi/processor_idle.c +0
-1@@ -46,7 +46,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> #include <acpi/processor.h>
Is the processor.h inclusion necessary here?
Quoted 7 lines
drivers/acpi/processor_idle.c +0
-0#define PREFIX "ACPI: "drivers/acpi/processor_perflib.c +0
-0
drivers/acpi/processor_perflib.c line 40
Quoted 7 lines
drivers/acpi/processor_perflib.c +1
-2@@ -36,8 +36,7 @@#include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h>
And here? And it's better to add #include <linux/acpi.h> to the other #include <linux/...> things.
drivers/acpi/processor_thermal.c line 38
Quoted 13 lines
drivers/acpi/processor_perflib.c +0
-0#define PREFIX "ACPI: "drivers/acpi/processor_thermal.c +1
-2@@ -33,9 +33,8 @@#include <asm/uaccess.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h>
Same comments as above.
Quoted 7 lines
drivers/acpi/processor_thermal.c +0
-0#define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +0
-0
drivers/acpi/processor_throttling.c line 40
Quoted 7 lines
drivers/acpi/processor_throttling.c +1
-2@@ -36,8 +36,7 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h>
Same comments as above.
Quoted 20 lines
drivers/acpi/processor_throttling.c +0
-0#define PREFIX "ACPI: "drivers/acpi/sbshc.c +1
-2@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> drivers/acpi/scan.c +0
-0
drivers/acpi/scan.c line 15
Quoted 5 lines
drivers/acpi/scan.c +0
-1@@ -12,7 +12,6 @@#include <linux/dmi.h> #include <linux/nls.h> -#include <acpi/acpi_drivers.h>
Remove the empty line too.
drivers/acpi/sleep.c line 24
Quoted 13 lines
drivers/acpi/scan.c +0
-0#include "internal.h" drivers/acpi/sleep.c +0
-2@@ -21,8 +21,6 @@#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h>
Remove the empty line too.
OK, you should get the idea. Please keep things consistent and nice. :-)
Thanks,
Rafael
RE: [PATCH 2/4] ACPI: Cleanup <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
Hi, Rafael
Thanks for commenting.
Quoted 21 lines
From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Tuesday, November 26, 2013 8:06 AMQuoted 4 lines · Lv Zheng
From: Lv Zheng <[email protected]>
This patch enfoces <
linux/acpi.h> inclusion instead of direct <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> inclusions.First off, please make the changelog shorter. Here's my version:
"Replace direct inclusions of <
acpi/acpi_drivers.h> and <acpi/acpi_bus.h>, which are incorrect, with <linux/acpi.h> inclusions.First of all, <
acpi/acpi_drivers.h> and <acpi/acpi_bus.h> should not be included directly from any files that are built forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset <linux/acpi.h> includes those files and forCONFIG_ACPIit provides stub ACPI symbols to be used in that case.
Quoted 5 lines
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 theacpi_pci_rootdeclarations the latter depends on are always there. That also is taken care of including <linux/acpi.h> as appropriate."
OK.
Quoted 4 lines
Second, please fold [3/4] into this one. Keeping them separate is artificial and pointless in my opinion. [Of course, the changelog will have to be modified then.]
OK.
Quoted 7 lines
[...]
Apart from the above ->
Quoted 2 lines
Signed-off-by Lv Zheng <[email protected]>---
[...]
Quoted 5 lines
Quoted 5 lines
drivers/acpi/ec.c +0
-0@@ -40,8 +40,7 @@
Quoted 8 lines
drivers/acpi/ec.c line 43
Quoted 6 lines
drivers/acpi/ec.c +1
-2#include <linux/spinlock.h> #include <linux/slab.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> -> add the new #include above the <
asm/io.h> maybe?
The patch was generated for people who even don't have too many ACPI header knowledge can review and determine that the modifications will not trigger regressions. So it doesn't cleanup other existing inclusion issues for the affected files, for example:
1. empty lines.
2. asm files
3. other acpi inclusions
Do you mean I need to cleanup whole file other than what the patch description claimed to clean? If so, I'll follow this comment and all the following ones to refresh the patch.
Quoted 4 lines
Quoted 4 lines
drivers/acpi/ec.c +0
-0#include <linux/dmi.h> #include "internal.h"
[...]
Quoted 15 lines
drivers/acpi/osl.c line 53
Quoted 10 lines
drivers/acpi/osl.c +0
-1@@ -50,7 +50,6 @@#include <asm/uaccess.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <acpi/processor.h> -> I guess all of these <acpi/...> inclusions may go away from here?
Quoted 2 lines
drivers/acpi/osl.c +0
-0#include "internal.h"
[...]
Quoted 34 lines
drivers/acpi/pci_link.c line 42
Quoted 8 lines
drivers/acpi/pci_link.c +0
-0@@ -40,8 +40,7 @@#include <linux/mutex.h> #include <linux/slab.h> -> Remove the empty line too.
Quoted 11 lines
drivers/acpi/pci_link.c +1
-2-#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +0
-0drivers/acpi/pci_root.c line 38
Quoted 6 lines
drivers/acpi/pci_root.c +0
-2@@ -35,8 +35,6 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> Does <
acpi/apei.h> have to be included directly here? If not, please remove it too.Quoted 2 lines
drivers/acpi/pci_root.c +0
-0#include "internal.h"
[...]
Quoted 98 lines
drivers/acpi/proc.c line 8
Quoted 11 lines
drivers/acpi/proc.c +1
-2@@ -5,8 +5,7 @@#include <linux/bcd.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> -> Put the new line above the <
asm/uaccess.h>Quoted 8 lines
drivers/acpi/proc.c +0
-0#include "sleep.h" drivers/acpi/processor_core.c +0
-0drivers/acpi/processor_core.c line 15
Quoted 6 lines
drivers/acpi/processor_core.c +1
-1@@ -11,7 +11,7 @@#include <linux/dmi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -> Remove the useless empty line and
processor.hinclusion too.drivers/acpi/processor_idle.c line 49
Quoted 12 lines
drivers/acpi/processor_core.c +0
-0#include "internal.h" drivers/acpi/processor_idle.c +0
-1@@ -46,7 +46,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> #include <acpi/processor.h> Is the
processor.hinclusion necessary here?Quoted 7 lines
drivers/acpi/processor_idle.c +0
-0#define PREFIX "ACPI: "drivers/acpi/processor_perflib.c +0
-0drivers/acpi/processor_perflib.c line 40
Quoted 7 lines
drivers/acpi/processor_perflib.c +1
-2@@ -36,8 +36,7 @@#include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> And here? And it's better to add #include <
linux/acpi.h> to the other #include <linux/...> things.drivers/acpi/processor_thermal.c line 38
Quoted 13 lines
drivers/acpi/processor_perflib.c +0
-0#define PREFIX "ACPI: "drivers/acpi/processor_thermal.c +1
-2@@ -33,9 +33,8 @@#include <asm/uaccess.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> Same comments as above.
Quoted 7 lines
drivers/acpi/processor_thermal.c +0
-0#define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +0
-0drivers/acpi/processor_throttling.c line 40
Quoted 7 lines
drivers/acpi/processor_throttling.c +1
-2@@ -36,8 +36,7 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> Same comments as above.
Quoted 1 line
drivers/acpi/processor_throttling.c +0
-0#define PREFIX "ACPI: "
[...]
Quoted 23 lines
drivers/acpi/scan.c line 15
Quoted 10 lines
drivers/acpi/scan.c +0
-1@@ -12,7 +12,6 @@#include <linux/dmi.h> #include <linux/nls.h> -#include <acpi/acpi_drivers.h> Remove the empty line too.
Quoted 10 lines
drivers/acpi/scan.c +0
-0#include "internal.h" drivers/acpi/sleep.c +0
-0@@ -21,8 +21,6 @@#include <asm/io.h>
Quoted 7 lines
drivers/acpi/sleep.c line 24
Quoted 3 lines
drivers/acpi/sleep.c +0
-2-#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> Remove the empty line too.
OK, you should get the idea. Please keep things consistent and nice. :-)
Yes, I'll try to cover all above comments in 1 patch. Thanks for the helping.
Best regards
-Lv
PATCH 3/4 ACPICA: Cleanup <acpi/acpi.h> inclusions.
In reply to Lv ZhengFrom: Lv Zheng <[email protected]>
This patch cleans up <acpi/acpi.h> inclusions.
1. For files where <linux/acpi.h> is already included, this patch cleans up them by deleting <acpi/acpi.h> inclusions. Note that if <acpi/acpi.h> is included before including <linux/acpi.h> in the original file, the inclusion of <linux/acpi.h> is moved up to avoid issues from happening.
2. The sfi_acpi files have invoked acpi_table_parse(), so this patch converts <acpi/acpi.h> inclusions into <linux/acpi.h> inclusions so that they can find the acpi_parse_table() prototypes.
3. For files where only <acpi/acpi.h> included, this patch cleans up them by replacing <acpi/acpi.h> inclusions with <linux/acpi.h>. Such files are those include ACPICA headers to find table definitions or ACPICA basic types.
4. For files where no actual ACPICA references, this patch cleans up them by deleting <acpi/acpi.h> inclusions.
Signed-off-by Lv Zheng <[email protected]>
--- arch/x86/pci/mmconfig_32.c | 1 - drivers/acpi/apei/einj.c | 1 - drivers/acpi/osl.c | 1 - drivers/char/tpm/tpm_acpi.c | 2 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 1 - drivers/hwmon/asus_atk0110.c | 1 - drivers/ide/ide-acpi.c | 1 - drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 2 +- drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/pci-acpi.c | 1 - drivers/platform/x86/tc1100-wmi.c | 1 - drivers/sfi/sfi_acpi.c | 2 +- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 3 --- include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 1 - include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- 19 files changed, 7 insertions(+), 21 deletions(-)
arch/x86/pci/mmconfig_32.c +0 -1
@@ -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))
drivers/acpi/apei/einj.c +0 -1
@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h"
drivers/acpi/osl.c +0 -1
@@ -49,7 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> #include <acpi/processor.h> #include "internal.h"
drivers/char/tpm/tpm_acpi.c +1 -1
@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h"
drivers/gpu/drm/nouveau/nouveau_acpi.c +0 -1
@@ -2,7 +2,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> #include <linux/vga_switcheroo.h>
drivers/hwmon/asus_atk0110.c +0 -1
@@ -17,7 +17,6 @@#include <linux/jiffies.h> #include <linux/err.h> -#include <acpi/acpi.h> #include <linux/acpi.h>
drivers/ide/ide-acpi.c +0 -1
@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h>
drivers/iommu/amd_iommu_init.c +0 -1
@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h>
drivers/iommu/intel_irq_remapping.c +1 -1
@@ -10,7 +10,7 @@#include <asm/smp.h> #include <asm/cpu.h> #include <linux/intel-iommu.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h>
drivers/pci/hotplug/pciehp.h +0 -1
@@ -163,7 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );
drivers/pci/pci-acpi.c +0 -1
@@ -12,7 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> #include <linux/pci-acpi.h> #include <linux/pm_runtime.h>
drivers/platform/x86/tc1100-wmi.c +0 -1
@@ -32,7 +32,6 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> #include <linux/acpi.h> #include <linux/platform_device.h>
drivers/sfi/sfi_acpi.c +1 -1
@@ -60,7 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include <linux/sfi.h> #include "sfi_core.h"
include/linux/acpi_io.h +1 -1
@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)
include/linux/ide.h +0 -3
@@ -18,9 +18,6 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif #include <asm/byteorder.h> #include <asm/io.h>
include/linux/iscsi_ibft.h +1 -1
@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table.
include/linux/pci_hotplug.h +0 -1
@@ -175,7 +175,6 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> #include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);
include/linux/sfi_acpi.h +1 -1
@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,
include/linux/tboot.h +1 -1
@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */
Signature · 1 line
1.7.10
PATCH 4/4 ACPI: Add support to force header inclusion rules for <linux/acpi.h>.
In reply to Lv ZhengFrom: Lv Zheng <[email protected]>
As there is only CONFIG_ACPI=n processing in the <linux/acpi.h>, it is not safe to include <acpi/acpi.h>, <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> directly for source out of Linux ACPI subsystems.
This patch adds error messaging to warn developers of such wrong inclusions.
In order not to be bisected and reverted as a wrong commit, warning messages are carefully split into a seperate patch other than the wrong inclusion cleanups.
Signed-off-by Lv Zheng <[email protected]>
--- drivers/acpi/acpica/Makefile | 2 +- include/acpi/acpi_bus.h | 5 +++++ include/acpi/acpi_drivers.h | 5 +++++ include/acpi/platform/aclinux.h | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-)
drivers/acpi/acpica/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for ACPICA Core interpreter # -ccflags-y := -Os +ccflags-y := -Os -DLINUXIZED_ACPICA ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT # use acpi.o to put all files here into acpi.o modparam namespace
include/acpi/acpi_bus.h +5 -0
@@ -26,6 +26,11 @@#ifndef __ACPI_BUS_H__#define __ACPI_BUS_H__ +/* <acpi/acpi_bus.h> is not safe for CONFIG_ACPI=n environment */ +#ifndef _LINUX_ACPI_H +#error "Please don't include <acpi/acpi_bus.h> direclty, including <linux/acpi.h> instead." +#endif +#include <linux/device.h>
include/acpi/acpi_drivers.h +5 -0
@@ -26,6 +26,11 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ +/* <acpi/acpi_drivers.h> is not safe for CONFIG_ACPI=n environment */ +#ifndef _LINUX_ACPI_H +#error "Please don't include <acpi/acpi_drivers.h> directly, including <linux/acpi.h> instead." +#endif +#define ACPI_MAX_STRING 80
include/acpi/platform/aclinux.h +10 -0
@@ -44,6 +44,16 @@#ifndef __ACLINUX_H__#define __ACLINUX_H__ +#ifdef __KERNEL__ + +/* ACPICA external files should not include ACPICA headers directly. */ + +#if !defined(LINUXIZED_ACPICA ) && !defined(_LINUX_ACPI_H) +#error "Please don't include <acpi/acpi.h> directly, including <linux/acpi.h> instead." +#endif + +#endif +/* Common (in-kernel/user-space) ACPICA configuration */ #define ACPI_USE_SYSTEM_CLIBRARY
Signature · 1 line
1.7.10
Re: [UPDATE PATCH 4/4] ACPI: Add support to force header inclusion rules for <linux/acpi.h>.
Quoted 8 lines · Lv Zheng
From: Lv Zheng <[email protected]>
(Update due to some typo fixes.)
As there is only
CONFIG_ACPI=nprocessing in the <linux/acpi.h>, it is not safe to include <acpi/acpi.h>, <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> directly for source out of Linux ACPI subsystems.
Quoted 8 lines
This patch adds error messaging to warn developers of such wrong inclusions.
In order not to be bisected and reverted as a wrong commit, warning messages are carefully split into a seperate patch other than the wrong inclusion cleanups.
Signed-off-by Lv Zheng <[email protected]>
I don't like this one to be honest.
Quoted 12 lines
--- drivers/acpi/acpica/Makefile | 2 +- include/acpi/acpi_bus.h | 5 +++++ include/acpi/acpi_drivers.h | 5 +++++ include/acpi/platform/aclinux.h | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-)drivers/acpi/acpica/Makefile +0
-0
drivers/acpi/acpica/Makefile line 5
Quoted 5 lines
drivers/acpi/acpica/Makefile +1
-1@@ -2,7 +2,7 @@ # Makefile for ACPICA Core interpreter # -ccflags-y := -Os +ccflags-y := -Os -DLINUXIZED_ACPICA
I don't like this (the naming and the way it is done).
Quoted 8 lines
drivers/acpi/acpica/Makefile +0
-0ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT # use acpi.o to put all files here into acpi.o modparam namespaceinclude/acpi/acpi_bus.h +0
-0
include/acpi/acpi_bus.h line 32
Quoted 7 lines
include/acpi/acpi_bus.h +4
-0@@ -26,6 +26,11 @@#ifndef __ACPI_BUS_H__#define __ACPI_BUS_H__ +/* <acpi/acpi_bus.h> is not safe for CONFIG_ACPI=n environment */ +#ifndef _LINUX_ACPI_H +#error "Please don't include <acpi/acpi_bus.h> directly, include <linux/acpi.h> instead." +#endif
And this should either go into all of the <acpi/*.h> files, not only to the two of them you chose, or to none of them. I prefer none.
Thanks,
Rafael
RE: [UPDATE PATCH 4/4] ACPI: Add support to force header inclusion rules for <linux/acpi.h>.
Hi, Rafael
Quoted 18 lines
From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Tuesday, November 26, 2013 8:10 AM
To: Lv Zheng
Cc: Wysocki, Rafael J; Brown, Len; Zheng, Lv; [email protected]; [email protected]
Subject: Re: [UPDATE PATCH 4/4] ACPI: Add support to force header inclusion rules for <linux/acpi.h>.Quoted 11 lines · Lv Zheng
From: Lv Zheng <[email protected]>
(Update due to some typo fixes.)
As there is only
CONFIG_ACPI=nprocessing in the <linux/acpi.h>, it is not safe to include <acpi/acpi.h>, <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> directly for source out of Linux ACPI subsystems.This patch adds error messaging to warn developers of such wrong inclusions.
Quoted 7 lines
Quoted 5 lines
In order not to be bisected and reverted as a wrong commit, warning messages are carefully split into a seperate patch other than the wrong inclusion cleanups.
Signed-off-by Lv Zheng <[email protected]>I don't like this one to be honest.
I generate this to prevent device driver writers to do stupid things before we can sort <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> out.
Quoted 32 lines
Quoted 13 lines
--- drivers/acpi/acpica/Makefile | 2 +- include/acpi/acpi_bus.h | 5 +++++ include/acpi/acpi_drivers.h | 5 +++++ include/acpi/platform/aclinux.h | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-)drivers/acpi/acpica/Makefile +0
-0drivers/acpi/acpica/Makefile line 5
Quoted 5 lines
drivers/acpi/acpica/Makefile +1
-1@@ -2,7 +2,7 @@ # Makefile for ACPICA Core interpreter # -ccflags-y := -Os +ccflags-y := -Os -DLINUXIZED_ACPICAI don't like this (the naming and the way it is done).
Quoted 11 lines
drivers/acpi/acpica/Makefile +0
-0ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT # use acpi.o to put all files here into acpi.o modparam namespaceinclude/acpi/acpi_bus.h +0
-0@@ -26,6 +26,11 @@#ifndef __ACPI_BUS_H__#define __ACPI_BUS_H__
Quoted 7 lines
include/acpi/acpi_bus.h line 32
Quoted 4 lines
include/acpi/acpi_bus.h +4
-0+/* <acpi/acpi_bus.h> is not safe for CONFIG_ACPI=n environment */ +#ifndef _LINUX_ACPI_H +#error "Please don't include <acpi/acpi_bus.h> directly, include <linux/acpi.h> instead." +#endif And this should either go into all of the <acpi/*.h> files, not only to the two of them you chose, or to none of them. I prefer none.
OK, let it be done for now. So we need to open eyes on new ACPI commits. :-)
I'll merge patch 2 and 3 and send it with your comments addressed and re-based.
Thanks and best regards
-Lv
Quoted 3 lines
Thanks,
Rafael
PATCH v2 1/1 ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Lv ZhengReplace direct inclusions of <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.
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 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.
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
Known issues:
1. No cleanups on other <acpi/xxx.h> inclusions.
There are <acpi/xxx.h> like <acpi/processor.h>, <acpi/video.h> could be elevated as <linux/acpi_xxx.h> candidates and include <linux/acpi.h> in them. So that we can cleanup more duplicated inclusions. This patch doesn't perform such cleanups yet. They are going to be done in seperate series after discussion.
Signed-off-by Lv Zheng <[email protected]>
--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 3 +-- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 235 deletions(-)
arch/ia64/hp/common/aml_nfw.c +1 -2
@@ -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 <[email protected]>" );
arch/x86/kernel/apic/apic_flat_64.c +1 -3
@@ -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
@@ -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
@@ -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
@@ -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"
drivers/acpi/ac.c +1 -2
@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/acpi_extlog.c +0 -1
@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h>
drivers/acpi/acpi_pad.c +1 -2
@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
drivers/acpi/apei/einj.c +0 -1
@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h"
drivers/acpi/battery.c +1 -2
@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "
drivers/acpi/blacklist.c +0 -1
@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h"
drivers/acpi/bus.c +0 -2
@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h>
drivers/acpi/button.c +1 -2
@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "
drivers/acpi/custom_method.c +1 -1
@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/debugfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );
drivers/acpi/dock.c +0 -2
@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/ec.c +2 -3
@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h"
drivers/acpi/event.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h>
drivers/acpi/fan.c +1 -2
@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/hed.c +0 -2
@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {
drivers/acpi/numa.c +0 -1
@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "
drivers/acpi/osl.c +0 -3
@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICES
drivers/acpi/pci_irq.c +0 -2
@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/pci_link.c +1 -3
@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/pci_root.c +1 -3
@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h"
drivers/acpi/power.c +1 -2
@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h"
drivers/acpi/proc.c +1 -3
@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENT
drivers/acpi/processor_core.c +1 -2
@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h"
drivers/acpi/processor_idle.c +1 -3
@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines
@@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/processor_perflib.c +2 -5
@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/processor_thermal.c +2 -5
@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "
drivers/acpi/processor_throttling.c +2 -5
@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/sbshc.c +1 -2
@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h>
drivers/acpi/scan.c +0 -3
@@ -11,9 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> -#include <asm/pgtable.h> #include "internal.h"
drivers/acpi/sleep.c +0 -4
@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h"
drivers/acpi/sysfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/thermal.c +2 -3
@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "
drivers/acpi/utils.c +0 -2
@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h"
drivers/acpi/video.c +2 -3
@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h"
drivers/acpi/wakeup.c +0 -1
@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h>
drivers/ata/libata-acpi.c +0 -2
@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 );MODULE_PARM_DESC (acpi_gtf_filter,"filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)" );
drivers/ata/pata_acpi.c +2 -3
@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"
drivers/char/hpet.c +2 -5
@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver.
drivers/char/tpm/tpm_acpi.c +1 -1
@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h"
drivers/char/tpm/tpm_ppi.c +0 -1
@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {
drivers/gpu/drm/i915/intel_acpi.c +0 -2
@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h"
drivers/gpu/drm/nouveau/nouveau_acpi.c +1 -6
@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h"
drivers/gpu/drm/radeon/radeon_acpi.c +1 -5
@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);
drivers/hv/vmbus_drv.c +0 -2
@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h>
@@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;
drivers/hwmon/acpi_power_meter.c +1 -2
@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );
drivers/hwmon/asus_atk0110.c +1 -5
@@ -16,11 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"
drivers/ide/ide-acpi.c +0 -1
@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h>
drivers/input/misc/atlas_btns.c +1 -1
@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"
drivers/iommu/amd_iommu_init.c +0 -1
@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h>
drivers/iommu/intel_irq_remapping.c +2 -2
@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h>
drivers/pci/hotplug/acpiphp_ibm.c +1 -2
@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h"
drivers/pci/hotplug/pciehp.h +0 -2
@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );
drivers/pci/ioapic.c +0 -1
@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;
drivers/pci/pci-acpi.c +0 -3
@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h>
drivers/pci/pci-label.c +0 -1
@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07
drivers/platform/x86/acer-wmi.c +0 -2
@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/asus-laptop.c +1 -2
@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"
drivers/platform/x86/asus-wmi.c +1 -2
@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h"
drivers/platform/x86/classmate-laptop.c +1 -2
@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;
drivers/platform/x86/dell-wmi-aio.c +0 -1
@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h>
drivers/platform/x86/dell-wmi.c +0 -1
@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h>
drivers/platform/x86/eeepc-laptop.c +1 -2
@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h>
drivers/platform/x86/eeepc-wmi.c +1 -1
@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h"
drivers/platform/x86/hp_accel.c +1 -1
@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"
drivers/platform/x86/ideapad-laptop.c +1 -2
@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/platform/x86/intel-rst.c +1 -1
@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel-smartconnect.c +1 -1
@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel_menlow.c +1 -3
@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );
drivers/platform/x86/intel_oaktrail.c +0 -3
@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"
drivers/platform/x86/mxm-wmi.c +1 -2
@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );
drivers/platform/x86/panasonic-laptop.c +1 -3
@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif
drivers/platform/x86/pvpanic.c +1 -2
@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );
drivers/platform/x86/samsung-q10.c +1 -1
@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7
drivers/platform/x86/sony-laptop.c +1 -3
@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h>
@@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \
drivers/platform/x86/tc1100-wmi.c +1 -3
@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"
drivers/platform/x86/thinkpad_acpi.c +4 -10
@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h>
@@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0
drivers/platform/x86/toshiba_acpi.c +1 -3
@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );
drivers/platform/x86/toshiba_bluetooth.c +1 -3
@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);
drivers/platform/x86/wmi.c +0 -2
@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/xo15-ebook.c +1 -2
@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"
drivers/pnp/pnpacpi/core.c +0 -1
@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h"
drivers/pnp/pnpacpi/pnpacpi.h +0 -1
@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h>
drivers/sfi/sfi_acpi.c +1 -2
@@ -60,8 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> - +#include <linux/acpi.h> #include <linux/sfi.h> #include "sfi_core.h"
drivers/staging/quickstart/quickstart.c +1 -1
@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/usb/core/usb-acpi.c +0 -1
@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h"
drivers/xen/xen-acpi-cpuhotplug.c +0 -3
@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
drivers/xen/xen-acpi-memhotplug.c +0 -1
@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
drivers/xen/xen-acpi-pad.c +2 -3
@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
drivers/xen/xen-acpi-processor.c +1 -3
@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
include/acpi/acpi_bus.h +0 -2
@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {
include/acpi/acpi_drivers.h +0 -3
@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/*
include/linux/acpi_io.h +1 -1
@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)
include/linux/ide.h +2 -6
@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0
include/linux/iscsi_ibft.h +1 -1
@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table.
include/linux/pci_hotplug.h +1 -2
@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);
include/linux/sfi_acpi.h +1 -1
@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,
include/linux/tboot.h +1 -1
@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */
tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1 -4
@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/
Signature · 1 line
1.7.10
Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.
Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
Rafael
Quoted 1,654 lines
Signed-off-by Lv Zheng <[email protected]>--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 3 +-- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 235 deletions(-)arch/ia64/hp/common/aml_nfw.c +1
-2@@ -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 <[email protected]>" );arch/x86/kernel/apic/apic_flat_64.c +1
-3@@ -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@@ -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@@ -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@@ -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"drivers/acpi/ac.c +1
-2@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/acpi_extlog.c +0
-1@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> drivers/acpi/acpi_pad.c +1
-2@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"drivers/acpi/apei/einj.c +0
-1@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h" drivers/acpi/battery.c +1
-2@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "drivers/acpi/blacklist.c +0
-1@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" drivers/acpi/bus.c +0
-2@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> drivers/acpi/button.c +1
-2@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "drivers/acpi/custom_method.c +1
-1@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/debugfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );drivers/acpi/dock.c +0
-2@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/ec.c +2
-3@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h" drivers/acpi/event.c +1
-1@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> drivers/acpi/fan.c +1
-2@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/hed.c +0
-2@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {drivers/acpi/numa.c +0
-1@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "drivers/acpi/osl.c +0
-3@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICESdrivers/acpi/pci_irq.c +0
-2@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/pci_link.c +1
-3@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +1
-3@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" drivers/acpi/power.c +1
-2@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" drivers/acpi/proc.c +1
-3@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENTdrivers/acpi/processor_core.c +1
-2@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h" drivers/acpi/processor_idle.c +1
-3@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines @@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_perflib.c +2
-5@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_thermal.c +2
-5@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +2
-5@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/sbshc.c +1
-2@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> drivers/acpi/scan.c +0
-3@@ -11,9 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> -#include <asm/pgtable.h> #include "internal.h" drivers/acpi/sleep.c +0
-4@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h" drivers/acpi/sysfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/thermal.c +2
-3@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/utils.c +0
-2@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" drivers/acpi/video.c +2
-3@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h" drivers/acpi/wakeup.c +0
-1@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> drivers/ata/libata-acpi.c +0
-2@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 );MODULE_PARM_DESC (acpi_gtf_filter,"filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)" );drivers/ata/pata_acpi.c +2
-3@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"drivers/char/hpet.c +2
-5@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. drivers/char/tpm/tpm_acpi.c +1
-1@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h" drivers/char/tpm/tpm_ppi.c +0
-1@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {drivers/gpu/drm/i915/intel_acpi.c +0
-2@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h" drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-6@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h" drivers/gpu/drm/radeon/radeon_acpi.c +1
-5@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);drivers/hv/vmbus_drv.c +0
-2@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h> @@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;drivers/hwmon/acpi_power_meter.c +1
-2@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );drivers/hwmon/asus_atk0110.c +1
-5@@ -16,11 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"drivers/ide/ide-acpi.c +0
-1@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h> drivers/input/misc/atlas_btns.c +1
-1@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"drivers/iommu/amd_iommu_init.c +0
-1@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h> drivers/iommu/intel_irq_remapping.c +2
-2@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h> drivers/pci/hotplug/acpiphp_ibm.c +1
-2@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h" drivers/pci/hotplug/pciehp.h +0
-2@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );drivers/pci/ioapic.c +0
-1@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;drivers/pci/pci-acpi.c +0
-3@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> drivers/pci/pci-label.c +0
-1@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07drivers/platform/x86/acer-wmi.c +0
-2@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/asus-laptop.c +1
-2@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"drivers/platform/x86/asus-wmi.c +1
-2@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h" drivers/platform/x86/classmate-laptop.c +1
-2@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;drivers/platform/x86/dell-wmi-aio.c +0
-1@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> drivers/platform/x86/dell-wmi.c +0
-1@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h> drivers/platform/x86/eeepc-laptop.c +1
-2@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> drivers/platform/x86/eeepc-wmi.c +1
-1@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h" drivers/platform/x86/hp_accel.c +1
-1@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"drivers/platform/x86/ideapad-laptop.c +1
-2@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/platform/x86/intel-rst.c +1
-1@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel-smartconnect.c +1
-1@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel_menlow.c +1
-3@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );drivers/platform/x86/intel_oaktrail.c +0
-3@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"drivers/platform/x86/mxm-wmi.c +1
-2@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );drivers/platform/x86/panasonic-laptop.c +1
-3@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif drivers/platform/x86/pvpanic.c +1
-2@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );drivers/platform/x86/samsung-q10.c +1
-1@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7drivers/platform/x86/sony-laptop.c +1
-3@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h> @@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \drivers/platform/x86/tc1100-wmi.c +1
-3@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"drivers/platform/x86/thinkpad_acpi.c +4
-10@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0drivers/platform/x86/toshiba_acpi.c +1
-3@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );drivers/platform/x86/toshiba_bluetooth.c +1
-3@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);drivers/platform/x86/wmi.c +0
-2@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/xo15-ebook.c +1
-2@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"drivers/pnp/pnpacpi/core.c +0
-1@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h" drivers/pnp/pnpacpi/pnpacpi.h +0
-1@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h> drivers/sfi/sfi_acpi.c +1
-2@@ -60,8 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> - +#include <linux/acpi.h> #include <linux/sfi.h> #include "sfi_core.h" drivers/staging/quickstart/quickstart.c +1
-1@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/usb/core/usb-acpi.c +0
-1@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h" drivers/xen/xen-acpi-cpuhotplug.c +0
-3@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-memhotplug.c +0
-1@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-pad.c +2
-3@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"drivers/xen/xen-acpi-processor.c +1
-3@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> include/acpi/acpi_bus.h +0
-2@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {include/acpi/acpi_drivers.h +0
-3@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/* include/linux/acpi_io.h +1
-1@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)include/linux/ide.h +2
-6@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0include/linux/iscsi_ibft.h +1
-1@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table. include/linux/pci_hotplug.h +1
-2@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);include/linux/sfi_acpi.h +1
-1@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,include/linux/tboot.h +1
-1@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */ tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1
-4@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
On Tue, Nov 26, 2013 at 09:29:33PM +0100, Rafael J. Wysocki wrote:>
Quoted 2 lines
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
I'm fine with it.
Signature · 1 line
Matthew Garrett | [email protected]
Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Rafael J. WysockiQuoted 19 lines · Rafael J. Wysocki
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.
Quoted 8 lines
Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
CC-ing Boris and David here.
I presume the proper compilation tests to make sure they do compile properly has been done.
Quoted 1,661 lines
Rafael
Quoted 1,654 lines
Signed-off-by Lv Zheng <[email protected]>--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 3 +-- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 235 deletions(-)arch/ia64/hp/common/aml_nfw.c +1
-2@@ -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 <[email protected]>" );arch/x86/kernel/apic/apic_flat_64.c +1
-3@@ -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@@ -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@@ -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@@ -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"drivers/acpi/ac.c +1
-2@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/acpi_extlog.c +0
-1@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> drivers/acpi/acpi_pad.c +1
-2@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"drivers/acpi/apei/einj.c +0
-1@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h" drivers/acpi/battery.c +1
-2@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "drivers/acpi/blacklist.c +0
-1@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" drivers/acpi/bus.c +0
-2@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> drivers/acpi/button.c +1
-2@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "drivers/acpi/custom_method.c +1
-1@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/debugfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );drivers/acpi/dock.c +0
-2@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/ec.c +2
-3@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h" drivers/acpi/event.c +1
-1@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> drivers/acpi/fan.c +1
-2@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/hed.c +0
-2@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {drivers/acpi/numa.c +0
-1@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "drivers/acpi/osl.c +0
-3@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICESdrivers/acpi/pci_irq.c +0
-2@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/pci_link.c +1
-3@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +1
-3@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" drivers/acpi/power.c +1
-2@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" drivers/acpi/proc.c +1
-3@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENTdrivers/acpi/processor_core.c +1
-2@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h" drivers/acpi/processor_idle.c +1
-3@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines @@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_perflib.c +2
-5@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_thermal.c +2
-5@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +2
-5@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/sbshc.c +1
-2@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> drivers/acpi/scan.c +0
-3@@ -11,9 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> -#include <asm/pgtable.h> #include "internal.h" drivers/acpi/sleep.c +0
-4@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h" drivers/acpi/sysfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/thermal.c +2
-3@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/utils.c +0
-2@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" drivers/acpi/video.c +2
-3@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h" drivers/acpi/wakeup.c +0
-1@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> drivers/ata/libata-acpi.c +0
-2@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 );MODULE_PARM_DESC (acpi_gtf_filter,"filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)" );drivers/ata/pata_acpi.c +2
-3@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"drivers/char/hpet.c +2
-5@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. drivers/char/tpm/tpm_acpi.c +1
-1@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h" drivers/char/tpm/tpm_ppi.c +0
-1@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {drivers/gpu/drm/i915/intel_acpi.c +0
-2@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h" drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-6@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h" drivers/gpu/drm/radeon/radeon_acpi.c +1
-5@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);drivers/hv/vmbus_drv.c +0
-2@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h> @@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;drivers/hwmon/acpi_power_meter.c +1
-2@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );drivers/hwmon/asus_atk0110.c +1
-5@@ -16,11 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"drivers/ide/ide-acpi.c +0
-1@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h> drivers/input/misc/atlas_btns.c +1
-1@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"drivers/iommu/amd_iommu_init.c +0
-1@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h> drivers/iommu/intel_irq_remapping.c +2
-2@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h> drivers/pci/hotplug/acpiphp_ibm.c +1
-2@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h" drivers/pci/hotplug/pciehp.h +0
-2@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );drivers/pci/ioapic.c +0
-1@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;drivers/pci/pci-acpi.c +0
-3@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> drivers/pci/pci-label.c +0
-1@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07drivers/platform/x86/acer-wmi.c +0
-2@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/asus-laptop.c +1
-2@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"drivers/platform/x86/asus-wmi.c +1
-2@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h" drivers/platform/x86/classmate-laptop.c +1
-2@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;drivers/platform/x86/dell-wmi-aio.c +0
-1@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> drivers/platform/x86/dell-wmi.c +0
-1@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h> drivers/platform/x86/eeepc-laptop.c +1
-2@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> drivers/platform/x86/eeepc-wmi.c +1
-1@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h" drivers/platform/x86/hp_accel.c +1
-1@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"drivers/platform/x86/ideapad-laptop.c +1
-2@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/platform/x86/intel-rst.c +1
-1@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel-smartconnect.c +1
-1@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel_menlow.c +1
-3@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );drivers/platform/x86/intel_oaktrail.c +0
-3@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"drivers/platform/x86/mxm-wmi.c +1
-2@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );drivers/platform/x86/panasonic-laptop.c +1
-3@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif drivers/platform/x86/pvpanic.c +1
-2@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );drivers/platform/x86/samsung-q10.c +1
-1@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7drivers/platform/x86/sony-laptop.c +1
-3@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h> @@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \drivers/platform/x86/tc1100-wmi.c +1
-3@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"drivers/platform/x86/thinkpad_acpi.c +4
-10@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0drivers/platform/x86/toshiba_acpi.c +1
-3@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );drivers/platform/x86/toshiba_bluetooth.c +1
-3@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);drivers/platform/x86/wmi.c +0
-2@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/xo15-ebook.c +1
-2@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"drivers/pnp/pnpacpi/core.c +0
-1@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h" drivers/pnp/pnpacpi/pnpacpi.h +0
-1@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h> drivers/sfi/sfi_acpi.c +1
-2@@ -60,8 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> - +#include <linux/acpi.h> #include <linux/sfi.h> #include "sfi_core.h" drivers/staging/quickstart/quickstart.c +1
-1@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/usb/core/usb-acpi.c +0
-1@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h" drivers/xen/xen-acpi-cpuhotplug.c +0
-3@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-memhotplug.c +0
-1@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-pad.c +2
-3@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"drivers/xen/xen-acpi-processor.c +1
-3@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> include/acpi/acpi_bus.h +0
-2@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {include/acpi/acpi_drivers.h +0
-3@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/* include/linux/acpi_io.h +1
-1@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)include/linux/ide.h +2
-6@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0include/linux/iscsi_ibft.h +1
-1@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table. include/linux/pci_hotplug.h +1
-2@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);include/linux/sfi_acpi.h +1
-1@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,include/linux/tboot.h +1
-1@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */ tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1
-4@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/ Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
Quoted 27 lines · Konrad Rzeszutek Wilk
Quoted 26 lines · Rafael J. Wysocki
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Quoted 6 lines
Quoted 1 line
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
CC-ing Boris and David here.
I presume the proper compilation tests to make sure they do compile properly has been done.
Yes and we're going to run it through the auto build machinery anyway.
Thanks,
Rafael
RE: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
Quoted 31 lines
From: [email protected] [mailto:[email protected]] On Behalf Of Rafael J. Wysocki
Sent: Wednesday, November 27, 2013 8:29 AMQuoted 27 lines · Konrad Rzeszutek Wilk
Quoted 26 lines · Rafael J. Wysocki
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
CC-ing Boris and David here.
I presume the proper compilation tests to make sure they do compile properly has been done.
Yes and we're going to run it through the auto build machinery anyway.
Hi, Rafael
The revision 1 is written in the style that it wouldn't introduce regressions as:
<acpi/acpi.h> <acpi/acpi_bus.h> <acpi/acpi_drivers.h> is replaced by <linux/acpi.h>. If there are 2 or more linux/acpi.h inclusions in the same files, then the latter ones are deleted. And it gets building/booting tested by enabling the affected modules for testing on x86 and x86_64.
The checker enabled tests only showed line number differences.
For special IA64 only modules, they are tested using "make <dirname of file>/<basename of file>.o" with necessary -D passed through command line.
I the revision 2, there are <asm/xxx.h> order changes, it thus may introduce regressions if there are tricks we don't know better than the original authors. My build tests still showed no issues, but we could feed them a coverage test.
Rafael, hope you can help me do this in your bleeding-edge branch and feel free to modify the commit to fix the issues caused by such tricks.
Thanks and best regards
-Lv
Quoted 8 lines
Thanks,
Rafael--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Konrad Rzeszutek WilkHi, All
I think:
For <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, what has been done in this patch is correct as according to my investigation, they are only used for CONFIG_ACPI=y code.
For <acpi/acpi.h> inclusion cleanups, we need to make stubs for ACPICA first or the following files that originally only reference ACPICA structures (for examples, table headers) may face build issues. As files include them may not be surrounded by "#ifdef CONFIG_ACPI".
The affected files are:include/linux/tboot.hinclude/linux/iscsi_ibft.hinclude/linux/acpi_io.hdrivers/iommu/intel_irq_remapping.cdrivers/char/tpm/tpm_acpi.carch/x86/kernel/apic/apic_flat_64.carch/x86/pci/mmconfig_32.cinclude/linux/ide.h
Should we get this issue discussed prior than doing an <acpi/acpi.h> cleanups?
Thanks and best regards
-Lv
Quoted 1,703 lines
-----Original Message-----
From: Konrad Rzeszutek Wilk [mailto:[email protected]]
Sent: Wednesday, November 27, 2013 4:29 AM
To: Rafael J. Wysocki; [email protected]; [email protected]
Cc: Zheng, Lv; Greg Kroah-Hartman; Bjorn Helgaas; H. Peter Anvin; Matthew Garrett; Luck, Tony; Wysocki, Rafael J; Brown, Len; Lv Zheng; [email protected]; LKML
Subject: Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.Quoted 19 lines · Rafael J. Wysocki
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.Quoted 8 lines
Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
CC-ing Boris and David here.
I presume the proper compilation tests to make sure they do compile properly has been done.
Quoted 706 lines
Rafael
Quoted 702 lines
Signed-off-by Lv Zheng <[email protected]>--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 3 +-- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 235 deletions(-)arch/ia64/hp/common/aml_nfw.c +1
-2@@ -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 <[email protected]>" );arch/x86/kernel/apic/apic_flat_64.c +1
-3@@ -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@@ -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@@ -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@@ -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"drivers/acpi/ac.c +1
-2@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/acpi_extlog.c +0
-1@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> drivers/acpi/acpi_pad.c +1
-2@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"drivers/acpi/apei/einj.c +0
-1@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h" drivers/acpi/battery.c +1
-2@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "drivers/acpi/blacklist.c +0
-1@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" drivers/acpi/bus.c +0
-2@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> drivers/acpi/button.c +1
-2@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "drivers/acpi/custom_method.c +1
-1@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/debugfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );drivers/acpi/dock.c +0
-2@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/ec.c +2
-3@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h" drivers/acpi/event.c +1
-1@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> drivers/acpi/fan.c +1
-2@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/hed.c +0
-2@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {drivers/acpi/numa.c +0
-1@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "drivers/acpi/osl.c +0
-3@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICESdrivers/acpi/pci_irq.c +0
-2@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/pci_link.c +1
-3@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +1
-3@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" drivers/acpi/power.c +1
-2@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" drivers/acpi/proc.c +1
-3@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENTdrivers/acpi/processor_core.c +1
-2@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h" drivers/acpi/processor_idle.c +1
-3@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines @@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_perflib.c +2
-5@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_thermal.c +2
-5@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +2
-5@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/sbshc.c +1
-2@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> drivers/acpi/scan.c +0
-3@@ -11,9 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> -#include <asm/pgtable.h> #include "internal.h" drivers/acpi/sleep.c +0
-4@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h" drivers/acpi/sysfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/thermal.c +2
-3@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/utils.c +0
-2@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" drivers/acpi/video.c +2
-3@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h" drivers/acpi/wakeup.c +0
-1@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> drivers/ata/libata-acpi.c +0
-0@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" Quoted 5 lines
drivers/ata/libata-acpi.c
Quoted 5 lines
drivers/ata/libata-acpi.c +0
-2-#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 ); MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freezelock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)");
Quoted 950 lines
Quoted 937 lines
drivers/ata/pata_acpi.c +2
-3@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"drivers/char/hpet.c +2
-5@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. drivers/char/tpm/tpm_acpi.c +1
-1@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h" drivers/char/tpm/tpm_ppi.c +0
-1@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {drivers/gpu/drm/i915/intel_acpi.c +0
-2@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h" drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-6@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h" drivers/gpu/drm/radeon/radeon_acpi.c +1
-5@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);drivers/hv/vmbus_drv.c +0
-2@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h> @@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;drivers/hwmon/acpi_power_meter.c +1
-2@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );drivers/hwmon/asus_atk0110.c +1
-5@@ -16,11 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"drivers/ide/ide-acpi.c +0
-1@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h> drivers/input/misc/atlas_btns.c +1
-1@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"drivers/iommu/amd_iommu_init.c +0
-1@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h> drivers/iommu/intel_irq_remapping.c +2
-2@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h> drivers/pci/hotplug/acpiphp_ibm.c +1
-2@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h" drivers/pci/hotplug/pciehp.h +0
-2@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );drivers/pci/ioapic.c +0
-1@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;drivers/pci/pci-acpi.c +0
-3@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> drivers/pci/pci-label.c +0
-1@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07drivers/platform/x86/acer-wmi.c +0
-2@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/asus-laptop.c +1
-2@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"drivers/platform/x86/asus-wmi.c +1
-2@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h" drivers/platform/x86/classmate-laptop.c +1
-2@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;drivers/platform/x86/dell-wmi-aio.c +0
-1@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> drivers/platform/x86/dell-wmi.c +0
-1@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h> drivers/platform/x86/eeepc-laptop.c +1
-2@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> drivers/platform/x86/eeepc-wmi.c +1
-1@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h" drivers/platform/x86/hp_accel.c +1
-1@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"drivers/platform/x86/ideapad-laptop.c +1
-2@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/platform/x86/intel-rst.c +1
-1@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel-smartconnect.c +1
-1@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel_menlow.c +1
-3@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );drivers/platform/x86/intel_oaktrail.c +0
-3@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"drivers/platform/x86/mxm-wmi.c +1
-2@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );drivers/platform/x86/panasonic-laptop.c +1
-3@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif drivers/platform/x86/pvpanic.c +1
-2@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );drivers/platform/x86/samsung-q10.c +1
-1@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7drivers/platform/x86/sony-laptop.c +1
-3@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h> @@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \drivers/platform/x86/tc1100-wmi.c +1
-3@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"drivers/platform/x86/thinkpad_acpi.c +4
-10@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0drivers/platform/x86/toshiba_acpi.c +1
-3@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );drivers/platform/x86/toshiba_bluetooth.c +1
-3@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);drivers/platform/x86/wmi.c +0
-2@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/xo15-ebook.c +1
-2@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"drivers/pnp/pnpacpi/core.c +0
-1@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h" drivers/pnp/pnpacpi/pnpacpi.h +0
-1@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h> drivers/sfi/sfi_acpi.c +1
-2@@ -60,8 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> - +#include <linux/acpi.h> #include <linux/sfi.h> #include "sfi_core.h" drivers/staging/quickstart/quickstart.c +1
-1@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/usb/core/usb-acpi.c +0
-1@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h" drivers/xen/xen-acpi-cpuhotplug.c +0
-3@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-memhotplug.c +0
-1@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-pad.c +2
-3@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"drivers/xen/xen-acpi-processor.c +1
-3@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> include/acpi/acpi_bus.h +0
-2@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {include/acpi/acpi_drivers.h +0
-3@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/* include/linux/acpi_io.h +1
-1@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)include/linux/ide.h +2
-6@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0include/linux/iscsi_ibft.h +1
-1@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table. include/linux/pci_hotplug.h +1
-2@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);include/linux/sfi_acpi.h +1
-1@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,include/linux/tboot.h +1
-1@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */ tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +0
-0@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c line 33
Quoted 10 lines
tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1
-4- +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/ --
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
Greg Kroah-Hartman
maintainerRe: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Rafael J. WysockiQuoted 19 lines · Rafael J. Wysocki
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.
Quoted 8 lines
Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
None from me, nice cleanups.
greg k-h
RE: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Rafael J. WysockiHi,
Quoted 26 lines
-----Original Message-----
From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Wednesday, November 27, 2013 4:30 AM
To: Zheng, Lv; Greg Kroah-Hartman; Bjorn Helgaas; H. Peter Anvin; Matthew Garrett; Luck, Tony; Konrad Rzeszutek Wilk
Cc: Wysocki, Rafael J; Brown, Len; Lv Zheng; [email protected]; LKML
Subject: Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.
Quoted 6 lines
Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
OK, I'll take care of updated revision.
Thanks
-Lv
Quoted 1,664 lines
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
Rafael
Quoted 699 lines
Signed-off-by Lv Zheng <[email protected]>--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 3 +-- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 235 deletions(-)arch/ia64/hp/common/aml_nfw.c +1
-2@@ -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 <[email protected]>" );arch/x86/kernel/apic/apic_flat_64.c +1
-3@@ -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@@ -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@@ -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@@ -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"drivers/acpi/ac.c +1
-2@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/acpi_extlog.c +0
-1@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> drivers/acpi/acpi_pad.c +1
-2@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"drivers/acpi/apei/einj.c +0
-1@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h" drivers/acpi/battery.c +1
-2@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "drivers/acpi/blacklist.c +0
-1@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" drivers/acpi/bus.c +0
-2@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> drivers/acpi/button.c +1
-2@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "drivers/acpi/custom_method.c +1
-1@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/debugfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );drivers/acpi/dock.c +0
-2@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/ec.c +2
-3@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h" drivers/acpi/event.c +1
-1@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> drivers/acpi/fan.c +1
-2@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/hed.c +0
-2@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {drivers/acpi/numa.c +0
-1@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "drivers/acpi/osl.c +0
-3@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICESdrivers/acpi/pci_irq.c +0
-2@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/pci_link.c +1
-3@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +1
-3@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" drivers/acpi/power.c +1
-2@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" drivers/acpi/proc.c +1
-3@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENTdrivers/acpi/processor_core.c +1
-2@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h" drivers/acpi/processor_idle.c +1
-3@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines @@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_perflib.c +2
-5@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_thermal.c +2
-5@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +2
-5@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/sbshc.c +1
-2@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> drivers/acpi/scan.c +0
-3@@ -11,9 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> -#include <asm/pgtable.h> #include "internal.h" drivers/acpi/sleep.c +0
-4@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h" drivers/acpi/sysfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/thermal.c +2
-3@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/utils.c +0
-2@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" drivers/acpi/video.c +2
-3@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h" drivers/acpi/wakeup.c +0
-1@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> drivers/ata/libata-acpi.c +0
-0drivers/ata/libata-acpi.c line 25
Quoted 8 lines
drivers/ata/libata-acpi.c +0
-2@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 ); MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freezelock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)");
Quoted 937 lines
drivers/ata/pata_acpi.c +2
-3@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"drivers/char/hpet.c +2
-5@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. drivers/char/tpm/tpm_acpi.c +1
-1@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h" drivers/char/tpm/tpm_ppi.c +0
-1@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {drivers/gpu/drm/i915/intel_acpi.c +0
-2@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h" drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-6@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h" drivers/gpu/drm/radeon/radeon_acpi.c +1
-5@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);drivers/hv/vmbus_drv.c +0
-2@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h> @@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;drivers/hwmon/acpi_power_meter.c +1
-2@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );drivers/hwmon/asus_atk0110.c +1
-5@@ -16,11 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"drivers/ide/ide-acpi.c +0
-1@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h> drivers/input/misc/atlas_btns.c +1
-1@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"drivers/iommu/amd_iommu_init.c +0
-1@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h> drivers/iommu/intel_irq_remapping.c +2
-2@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h> drivers/pci/hotplug/acpiphp_ibm.c +1
-2@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h" drivers/pci/hotplug/pciehp.h +0
-2@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );drivers/pci/ioapic.c +0
-1@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;drivers/pci/pci-acpi.c +0
-3@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> drivers/pci/pci-label.c +0
-1@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07drivers/platform/x86/acer-wmi.c +0
-2@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/asus-laptop.c +1
-2@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"drivers/platform/x86/asus-wmi.c +1
-2@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h" drivers/platform/x86/classmate-laptop.c +1
-2@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;drivers/platform/x86/dell-wmi-aio.c +0
-1@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> drivers/platform/x86/dell-wmi.c +0
-1@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h> drivers/platform/x86/eeepc-laptop.c +1
-2@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> drivers/platform/x86/eeepc-wmi.c +1
-1@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h" drivers/platform/x86/hp_accel.c +1
-1@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"drivers/platform/x86/ideapad-laptop.c +1
-2@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/platform/x86/intel-rst.c +1
-1@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel-smartconnect.c +1
-1@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel_menlow.c +1
-3@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );drivers/platform/x86/intel_oaktrail.c +0
-3@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"drivers/platform/x86/mxm-wmi.c +1
-2@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );drivers/platform/x86/panasonic-laptop.c +1
-3@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif drivers/platform/x86/pvpanic.c +1
-2@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );drivers/platform/x86/samsung-q10.c +1
-1@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7drivers/platform/x86/sony-laptop.c +1
-3@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h> @@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \drivers/platform/x86/tc1100-wmi.c +1
-3@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"drivers/platform/x86/thinkpad_acpi.c +4
-10@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0drivers/platform/x86/toshiba_acpi.c +1
-3@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );drivers/platform/x86/toshiba_bluetooth.c +1
-3@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);drivers/platform/x86/wmi.c +0
-2@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/xo15-ebook.c +1
-2@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"drivers/pnp/pnpacpi/core.c +0
-1@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h" drivers/pnp/pnpacpi/pnpacpi.h +0
-1@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h> drivers/sfi/sfi_acpi.c +1
-2@@ -60,8 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> - +#include <linux/acpi.h> #include <linux/sfi.h> #include "sfi_core.h" drivers/staging/quickstart/quickstart.c +1
-1@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/usb/core/usb-acpi.c +0
-1@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h" drivers/xen/xen-acpi-cpuhotplug.c +0
-3@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-memhotplug.c +0
-1@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-pad.c +2
-3@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"drivers/xen/xen-acpi-processor.c +1
-3@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> include/acpi/acpi_bus.h +0
-2@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {include/acpi/acpi_drivers.h +0
-3@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/* include/linux/acpi_io.h +1
-1@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)include/linux/ide.h +2
-6@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0include/linux/iscsi_ibft.h +1
-1@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table. include/linux/pci_hotplug.h +1
-2@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);include/linux/sfi_acpi.h +1
-1@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,include/linux/tboot.h +1
-1@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */ tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +0
-0@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c line 33
Quoted 10 lines
tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1
-4- +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/ --
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Rafael J. WysockiQuoted 19 lines · Rafael J. Wysocki
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.
Quoted 8 lines
Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
Since no one seems to have problems with this, I've queued it up for the next ACPI pull request, if there are no problems with auto builds.
Thanks!
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Rafael J. Wysocki
Acked-by Bjorn HelgaasRe: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
Quoted 24 lines · Rafael J. Wysocki
Quoted 23 lines · Rafael J. Wysocki
Quoted 21 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.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 forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI 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 theacpi_pci_rootdeclarations 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 inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
Quoted 7 lines
Quoted 4 lines
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
Since no one seems to have problems with this, I've queued it up for the next ACPI pull request, if there are no problems with auto builds.
I replaced this patch with the following one due to built errors introduced by it for exotic combinations of Kconfig options.
The only difference is the few files where the /* FIXME: ... */ comments have been added.
Thanks,
Rafael
---
From: Lv Zheng <[email protected]>
Subject: 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 <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Tony Luck <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 2 +- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 234 deletions(-)
arch/ia64/hp/common/aml_nfw.c +1 -2
@@ -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 <[email protected]>" );
arch/x86/kernel/apic/apic_flat_64.c +1 -3
@@ -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
@@ -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
@@ -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
@@ -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"
drivers/acpi/ac.c +1 -2
@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/acpi_extlog.c +0 -1
@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h>
drivers/acpi/acpi_pad.c +1 -2
@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
drivers/acpi/apei/einj.c +0 -1
@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h"
drivers/acpi/battery.c +1 -2
@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "
drivers/acpi/blacklist.c +0 -1
@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h"
drivers/acpi/bus.c +0 -2
@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h>
drivers/acpi/button.c +1 -2
@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "
drivers/acpi/custom_method.c +1 -1
@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/debugfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );
drivers/acpi/dock.c +0 -2
@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/ec.c +2 -3
@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h"
drivers/acpi/event.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h>
drivers/acpi/fan.c +1 -2
@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/hed.c +0 -2
@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {
drivers/acpi/numa.c +0 -1
@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "
drivers/acpi/osl.c +0 -3
@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICES
drivers/acpi/pci_irq.c +0 -2
@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/pci_link.c +1 -3
@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/pci_root.c +1 -3
@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h"
drivers/acpi/power.c +1 -2
@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h"
drivers/acpi/proc.c +1 -3
@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENT
drivers/acpi/processor_core.c +1 -2
@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h"
drivers/acpi/processor_idle.c +1 -3
@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines
@@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/processor_perflib.c +2 -5
@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/processor_thermal.c +2 -5
@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "
drivers/acpi/processor_throttling.c +2 -5
@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/sbshc.c +1 -2
@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h>
drivers/acpi/scan.c +0 -2
@@ -11,8 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> #include "internal.h"
drivers/acpi/sleep.c +0 -4
@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h"
drivers/acpi/sysfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/thermal.c +2 -3
@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "
drivers/acpi/utils.c +0 -2
@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h"
drivers/acpi/video.c +2 -3
@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h"
drivers/acpi/wakeup.c +0 -1
@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h>
drivers/ata/libata-acpi.c +0 -2
@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 );MODULE_PARM_DESC (acpi_gtf_filter,"filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)" );
drivers/ata/pata_acpi.c +2 -3
@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"
drivers/char/hpet.c +2 -5
@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver.
drivers/char/tpm/tpm_acpi.c +1 -1
@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h"
drivers/char/tpm/tpm_ppi.c +0 -1
@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {
drivers/gpu/drm/i915/intel_acpi.c +0 -2
@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h"
drivers/gpu/drm/nouveau/nouveau_acpi.c +1 -6
@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h"
drivers/gpu/drm/radeon/radeon_acpi.c +1 -5
@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);
drivers/hv/vmbus_drv.c +0 -2
@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h>
@@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;
drivers/hwmon/acpi_power_meter.c +1 -2
@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );
drivers/hwmon/asus_atk0110.c +1 -6
@@ -16,12 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpixf.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"
drivers/ide/ide-acpi.c +0 -1
@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h>
drivers/input/misc/atlas_btns.c +1 -1
@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"
drivers/iommu/amd_iommu_init.c +0 -1
@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h>
drivers/iommu/intel_irq_remapping.c +2 -2
@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h>
drivers/pci/hotplug/acpiphp_ibm.c +1 -2
@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h"
drivers/pci/hotplug/pciehp.h +0 -2
@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );
drivers/pci/ioapic.c +0 -1
@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;
drivers/pci/pci-acpi.c +0 -3
@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h>
drivers/pci/pci-label.c +0 -1
@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07
drivers/platform/x86/acer-wmi.c +0 -2
@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/asus-laptop.c +1 -2
@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"
drivers/platform/x86/asus-wmi.c +1 -2
@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h"
drivers/platform/x86/classmate-laptop.c +1 -2
@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;
drivers/platform/x86/dell-wmi-aio.c +0 -1
@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h>
drivers/platform/x86/dell-wmi.c +0 -1
@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h>
drivers/platform/x86/eeepc-laptop.c +1 -2
@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h>
drivers/platform/x86/eeepc-wmi.c +1 -1
@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h"
drivers/platform/x86/hp_accel.c +1 -1
@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"
drivers/platform/x86/ideapad-laptop.c +1 -2
@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/platform/x86/intel-rst.c +1 -1
@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel-smartconnect.c +1 -1
@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel_menlow.c +1 -3
@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );
drivers/platform/x86/intel_oaktrail.c +0 -3
@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"
drivers/platform/x86/mxm-wmi.c +1 -2
@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );
drivers/platform/x86/panasonic-laptop.c +1 -3
@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif
drivers/platform/x86/pvpanic.c +1 -2
@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );
drivers/platform/x86/samsung-q10.c +1 -1
@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7
drivers/platform/x86/sony-laptop.c +1 -3
@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h>
@@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \
drivers/platform/x86/tc1100-wmi.c +1 -3
@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"
drivers/platform/x86/thinkpad_acpi.c +4 -10
@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h>
@@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0
drivers/platform/x86/toshiba_acpi.c +1 -3
@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );
drivers/platform/x86/toshiba_bluetooth.c +1 -3
@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);
drivers/platform/x86/wmi.c +0 -2
@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/xo15-ebook.c +1 -2
@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"
drivers/pnp/pnpacpi/core.c +0 -1
@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h"
drivers/pnp/pnpacpi/pnpacpi.h +0 -1
@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h>
drivers/sfi/sfi_acpi.c +1 -1
@@ -60,7 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ #include <linux/sfi.h> #include "sfi_core.h"
drivers/staging/quickstart/quickstart.c +1 -1
@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/usb/core/usb-acpi.c +0 -1
@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h"
drivers/xen/xen-acpi-cpuhotplug.c +0 -3
@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
drivers/xen/xen-acpi-memhotplug.c +0 -1
@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
drivers/xen/xen-acpi-pad.c +2 -3
@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
drivers/xen/xen-acpi-processor.c +1 -3
@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
include/acpi/acpi_bus.h +0 -2
@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {
include/acpi/acpi_drivers.h +0 -3
@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/*
include/linux/acpi_io.h +1 -1
@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)
include/linux/ide.h +2 -6
@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0
include/linux/iscsi_ibft.h +1 -1
@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ /* * Logical location of iSCSI Boot Format Table.
include/linux/pci_hotplug.h +1 -2
@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);
include/linux/sfi_acpi.h +1 -1
@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,
include/linux/tboot.h +1 -1
@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */
tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1 -4
@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/
Signature · 1 line
1.7.10