aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi_bus.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r--include/acpi/acpi_bus.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 359ef11725a6..20b05cd68663 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -149,8 +149,7 @@ struct acpi_device_flags {
149 u32 power_manageable:1; 149 u32 power_manageable:1;
150 u32 performance_manageable:1; 150 u32 performance_manageable:1;
151 u32 wake_capable:1; /* Wakeup(_PRW) supported? */ 151 u32 wake_capable:1; /* Wakeup(_PRW) supported? */
152 u32 force_power_state:1; 152 u32 reserved:23;
153 u32 reserved:22;
154}; 153};
155 154
156/* File System */ 155/* File System */
@@ -242,20 +241,14 @@ struct acpi_device_perf {
242struct acpi_device_wakeup_flags { 241struct acpi_device_wakeup_flags {
243 u8 valid:1; /* Can successfully enable wakeup? */ 242 u8 valid:1; /* Can successfully enable wakeup? */
244 u8 run_wake:1; /* Run-Wake GPE devices */ 243 u8 run_wake:1; /* Run-Wake GPE devices */
245 u8 always_enabled:1; /* Run-wake devices that are always enabled */
246 u8 notifier_present:1; /* Wake-up notify handler has been installed */ 244 u8 notifier_present:1; /* Wake-up notify handler has been installed */
247}; 245};
248 246
249struct acpi_device_wakeup_state {
250 u8 enabled:1;
251};
252
253struct acpi_device_wakeup { 247struct acpi_device_wakeup {
254 acpi_handle gpe_device; 248 acpi_handle gpe_device;
255 u64 gpe_number; 249 u64 gpe_number;
256 u64 sleep_state; 250 u64 sleep_state;
257 struct acpi_handle_list resources; 251 struct acpi_handle_list resources;
258 struct acpi_device_wakeup_state state;
259 struct acpi_device_wakeup_flags flags; 252 struct acpi_device_wakeup_flags flags;
260 int prepare_count; 253 int prepare_count;
261 int run_wake_count; 254 int run_wake_count;
@@ -328,8 +321,8 @@ void acpi_bus_data_handler(acpi_handle handle, void *context);
328acpi_status acpi_bus_get_status_handle(acpi_handle handle, 321acpi_status acpi_bus_get_status_handle(acpi_handle handle,
329 unsigned long long *sta); 322 unsigned long long *sta);
330int acpi_bus_get_status(struct acpi_device *device); 323int acpi_bus_get_status(struct acpi_device *device);
331int acpi_bus_get_power(acpi_handle handle, int *state);
332int acpi_bus_set_power(acpi_handle handle, int state); 324int acpi_bus_set_power(acpi_handle handle, int state);
325int acpi_bus_update_power(acpi_handle handle, int *state_p);
333bool acpi_bus_power_manageable(acpi_handle handle); 326bool acpi_bus_power_manageable(acpi_handle handle);
334bool acpi_bus_can_wakeup(acpi_handle handle); 327bool acpi_bus_can_wakeup(acpi_handle handle);
335#ifdef CONFIG_ACPI_PROC_EVENT 328#ifdef CONFIG_ACPI_PROC_EVENT