diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 2f1c68c7a727..a5ac0bc7f52e 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -259,6 +259,7 @@ struct acpi_device_perf { | |||
259 | /* Wakeup Management */ | 259 | /* Wakeup Management */ |
260 | struct acpi_device_wakeup_flags { | 260 | struct acpi_device_wakeup_flags { |
261 | u8 valid:1; /* Can successfully enable wakeup? */ | 261 | u8 valid:1; /* Can successfully enable wakeup? */ |
262 | u8 prepared:1; /* Has the wake-up capability been enabled? */ | ||
262 | u8 run_wake:1; /* Run-Wake GPE devices */ | 263 | u8 run_wake:1; /* Run-Wake GPE devices */ |
263 | }; | 264 | }; |
264 | 265 | ||
@@ -335,6 +336,8 @@ void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context); | |||
335 | int acpi_bus_get_status(struct acpi_device *device); | 336 | int acpi_bus_get_status(struct acpi_device *device); |
336 | int acpi_bus_get_power(acpi_handle handle, int *state); | 337 | int acpi_bus_get_power(acpi_handle handle, int *state); |
337 | int acpi_bus_set_power(acpi_handle handle, int state); | 338 | int acpi_bus_set_power(acpi_handle handle, int state); |
339 | bool acpi_bus_power_manageable(acpi_handle handle); | ||
340 | bool acpi_bus_can_wakeup(acpi_handle handle); | ||
338 | #ifdef CONFIG_ACPI_PROC_EVENT | 341 | #ifdef CONFIG_ACPI_PROC_EVENT |
339 | int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data); | 342 | int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data); |
340 | int acpi_bus_generate_proc_event4(const char *class, const char *bid, u8 type, int data); | 343 | int acpi_bus_generate_proc_event4(const char *class, const char *bid, u8 type, int data); |
@@ -376,14 +379,19 @@ acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | |||
376 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 379 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
377 | 380 | ||
378 | #ifdef CONFIG_PM_SLEEP | 381 | #ifdef CONFIG_PM_SLEEP |
379 | int acpi_pm_device_sleep_state(struct device *, int, int *); | 382 | int acpi_pm_device_sleep_state(struct device *, int *); |
383 | int acpi_pm_device_sleep_wake(struct device *, bool); | ||
380 | #else /* !CONFIG_PM_SLEEP */ | 384 | #else /* !CONFIG_PM_SLEEP */ |
381 | static inline int acpi_pm_device_sleep_state(struct device *d, int w, int *p) | 385 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p) |
382 | { | 386 | { |
383 | if (p) | 387 | if (p) |
384 | *p = ACPI_STATE_D0; | 388 | *p = ACPI_STATE_D0; |
385 | return ACPI_STATE_D3; | 389 | return ACPI_STATE_D3; |
386 | } | 390 | } |
391 | static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) | ||
392 | { | ||
393 | return -ENODEV; | ||
394 | } | ||
387 | #endif /* !CONFIG_PM_SLEEP */ | 395 | #endif /* !CONFIG_PM_SLEEP */ |
388 | 396 | ||
389 | #endif /* CONFIG_ACPI */ | 397 | #endif /* CONFIG_ACPI */ |