aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-01 20:40:09 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-14 18:15:16 -0500
commitec2cd81ccfc055155ef4ca673f207168f516d287 (patch)
tree5a034f64e18db76e57af7a9147fa9ad7e4d05838 /include/acpi
parentbdda27fb98463244f056852f800bbce7db67dc4a (diff)
ACPI / PM: Move routines for adding/removing device wakeup notifiers
ACPI routines for adding and removing device wakeup notifiers are currently defined in a PCI-specific file, but they will be necessary for non-PCI devices too, so move them to a separate file under drivers/acpi and rename them to indicate their ACPI origins. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 72053db9c2e..6983272f9d0 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -416,8 +416,23 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state);
416int acpi_disable_wakeup_device_power(struct acpi_device *dev); 416int acpi_disable_wakeup_device_power(struct acpi_device *dev);
417 417
418#ifdef CONFIG_PM 418#ifdef CONFIG_PM
419acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
420 acpi_notify_handler handler, void *context);
421acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
422 acpi_notify_handler handler);
419int acpi_pm_device_sleep_state(struct device *, int *, int); 423int acpi_pm_device_sleep_state(struct device *, int *, int);
420#else 424#else
425static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
426 acpi_notify_handler handler,
427 void *context)
428{
429 return AE_SUPPORT;
430}
431static inline acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
432 acpi_notify_handler handler)
433{
434 return AE_SUPPORT;
435}
421static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) 436static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
422{ 437{
423 if (p) 438 if (p)