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 <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
c15d8a6499
commit
e60cc7a6f0
|
@ -39,6 +39,8 @@
|
||||||
#include <acpi/acpi_bus.h>
|
#include <acpi/acpi_bus.h>
|
||||||
#include <acpi/acpi_drivers.h>
|
#include <acpi/acpi_drivers.h>
|
||||||
|
|
||||||
|
#include "internal.h"
|
||||||
|
|
||||||
#define _COMPONENT ACPI_BUS_COMPONENT
|
#define _COMPONENT ACPI_BUS_COMPONENT
|
||||||
ACPI_MODULE_NAME("bus");
|
ACPI_MODULE_NAME("bus");
|
||||||
|
|
||||||
|
|
24
drivers/acpi/internal.h
Normal file
24
drivers/acpi/internal.h
Normal file
|
@ -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);
|
|
@ -11,6 +11,8 @@
|
||||||
|
|
||||||
#include <acpi/acpi_drivers.h>
|
#include <acpi/acpi_drivers.h>
|
||||||
|
|
||||||
|
#include "internal.h"
|
||||||
|
|
||||||
#define _COMPONENT ACPI_BUS_COMPONENT
|
#define _COMPONENT ACPI_BUS_COMPONENT
|
||||||
ACPI_MODULE_NAME("scan");
|
ACPI_MODULE_NAME("scan");
|
||||||
#define STRUCT_TO_INT(s) (*((int*)&s))
|
#define STRUCT_TO_INT(s) (*((int*)&s))
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
|
|
||||||
#include <acpi/acpi_bus.h>
|
#include <acpi/acpi_bus.h>
|
||||||
#include <acpi/acpi_drivers.h>
|
#include <acpi/acpi_drivers.h>
|
||||||
|
|
||||||
|
#include "internal.h"
|
||||||
#include "sleep.h"
|
#include "sleep.h"
|
||||||
|
|
||||||
u8 sleep_states[ACPI_S_STATE_COUNT];
|
u8 sleep_states[ACPI_S_STATE_COUNT];
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
#include <acpi/acpi_drivers.h>
|
#include <acpi/acpi_drivers.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
|
||||||
|
#include "internal.h"
|
||||||
#include "sleep.h"
|
#include "sleep.h"
|
||||||
|
|
||||||
#define _COMPONENT ACPI_SYSTEM_COMPONENT
|
#define _COMPONENT ACPI_SYSTEM_COMPONENT
|
||||||
|
|
|
@ -98,24 +98,6 @@ int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
|
||||||
struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
|
struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
|
||||||
int bus);
|
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
|
Processor
|
||||||
-------------------------------------------------------------------------- */
|
-------------------------------------------------------------------------- */
|
||||||
|
@ -165,9 +147,4 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------
|
|
||||||
Suspend/Resume
|
|
||||||
-------------------------------------------------------------------------- */
|
|
||||||
extern int acpi_sleep_init(void);
|
|
||||||
|
|
||||||
#endif /*__ACPI_DRIVERS_H__*/
|
#endif /*__ACPI_DRIVERS_H__*/
|
||||||
|
|
Loading…
Reference in a new issue