ACPI: move private declarations to internal.h
Subsystems (2)
PATCH 1/1 ACPI: move private declarations to internal.h
A number of things that shouldn't be exposed outside the ACPI core were declared in include/acpi/acpi_drivers.h, where anybody can see them. This patch moves those declarations to a new "internal.h" inside drivers/acpi.
Signed-off-by Bjorn Helgaas <[email protected]>
--- drivers/acpi/bus.c | 2 ++ drivers/acpi/internal.h | 24 ++++++++++++++++++++++++ drivers/acpi/scan.c | 2 ++ drivers/acpi/sleep.c | 2 ++ drivers/acpi/wakeup.c | 2 ++ include/acpi/acpi_drivers.h | 23 ----------------------- 6 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 drivers/acpi/internal.h
drivers/acpi/bus.c +2 -0
@@ -39,6 +39,8 @@#include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> +#include "internal.h" +#define _COMPONENT ACPI_BUS_COMPONENTACPI_MODULE_NAME ("bus" );
drivers/acpi/internal.h new file +24 -0
@@ -0,0 +1,24 @@ +/* For use by Linux/ACPI infrastructure, not drivers */ + +/* -------------------------------------------------------------------------- +Power Resource +-------------------------------------------------------------------------- */ + +int acpi_device_sleep_wake (struct acpi_device *dev, +int enable,int sleep_state,int dev_state); +int acpi_enable_wakeup_device_power (struct acpi_device *dev,int sleep_state); +int acpi_disable_wakeup_device_power (struct acpi_device *dev); +int acpi_power_get_inferred_state (struct acpi_device *device); +int acpi_power_transition (struct acpi_device *device,int state); +extern int acpi_power_nocheck; + +/* -------------------------------------------------------------------------- +Embedded Controller +-------------------------------------------------------------------------- */ +int acpi_ec_ecdt_probe (void ); +int acpi_boot_ec_enable (void ); + +/*-------------------------------------------------------------------------- +Suspend/Resume +-------------------------------------------------------------------------- */ +extern int acpi_sleep_init (void );
drivers/acpi/scan.c +2 -0
@@ -11,6 +11,8 @@#include <acpi/acpi_drivers.h> +#include "internal.h" +#define _COMPONENT ACPI_BUS_COMPONENTACPI_MODULE_NAME ("scan" );#define STRUCT_TO_INT (s) (*((int*)&s))
drivers/acpi/sleep.c +2 -0
@@ -21,6 +21,8 @@#include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> + +#include "internal.h" #include "sleep.h" u8 sleep_states[ACPI_S_STATE_COUNT ];
drivers/acpi/wakeup.c +2 -0
@@ -8,6 +8,8 @@#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> + +#include "internal.h" #include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENT
include/acpi/acpi_drivers.h +0 -23
@@ -99,24 +99,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, int bus);/* -------------------------------------------------------------------------- -Power Resource --------------------------------------------------------------------------- */ - -int acpi_device_sleep_wake (struct acpi_device *dev, -int enable,int sleep_state,int dev_state); -int acpi_enable_wakeup_device_power (struct acpi_device *dev,int sleep_state); -int acpi_disable_wakeup_device_power (struct acpi_device *dev); -int acpi_power_get_inferred_state (struct acpi_device *device); -int acpi_power_transition (struct acpi_device *device,int state); -extern int acpi_power_nocheck; - -/* -------------------------------------------------------------------------- -Embedded Controller --------------------------------------------------------------------------- */ -int acpi_ec_ecdt_probe (void ); -int acpi_boot_ec_enable (void ); - -/* -------------------------------------------------------------------------- Processor -------------------------------------------------------------------------- */
@@ -165,9 +147,4 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle) }#endif -/*-------------------------------------------------------------------------- -Suspend/Resume --------------------------------------------------------------------------- */ -extern int acpi_sleep_init (void ); -#endif /*__ACPI_DRIVERS_H__*/
applied
--
Len Brown, Intel Open Source Technology Center