diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index d64a3010332f..89c60b0f6408 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -222,7 +222,8 @@ struct acpi_device_power_flags { | |||
222 | u32 power_resources:1; /* Power resources */ | 222 | u32 power_resources:1; /* Power resources */ |
223 | u32 inrush_current:1; /* Serialize Dx->D0 */ | 223 | u32 inrush_current:1; /* Serialize Dx->D0 */ |
224 | u32 power_removed:1; /* Optimize Dx->D0 */ | 224 | u32 power_removed:1; /* Optimize Dx->D0 */ |
225 | u32 reserved:28; | 225 | u32 ignore_parent:1; /* Power is independent of parent power state */ |
226 | u32 reserved:27; | ||
226 | }; | 227 | }; |
227 | 228 | ||
228 | struct acpi_device_power_state { | 229 | struct acpi_device_power_state { |
@@ -311,7 +312,6 @@ struct acpi_device { | |||
311 | unsigned int physical_node_count; | 312 | unsigned int physical_node_count; |
312 | struct list_head physical_node_list; | 313 | struct list_head physical_node_list; |
313 | struct mutex physical_node_lock; | 314 | struct mutex physical_node_lock; |
314 | struct list_head power_dependent; | ||
315 | void (*remove)(struct acpi_device *); | 315 | void (*remove)(struct acpi_device *); |
316 | }; | 316 | }; |
317 | 317 | ||
@@ -444,8 +444,6 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev, | |||
444 | acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, | 444 | acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, |
445 | acpi_notify_handler handler); | 445 | acpi_notify_handler handler); |
446 | int acpi_pm_device_sleep_state(struct device *, int *, int); | 446 | int acpi_pm_device_sleep_state(struct device *, int *, int); |
447 | void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev); | ||
448 | void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev); | ||
449 | #else | 447 | #else |
450 | static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, | 448 | static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, |
451 | acpi_notify_handler handler, | 449 | acpi_notify_handler handler, |
@@ -466,10 +464,6 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) | |||
466 | return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ? | 464 | return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ? |
467 | m : ACPI_STATE_D0; | 465 | m : ACPI_STATE_D0; |
468 | } | 466 | } |
469 | static inline void acpi_dev_pm_add_dependent(acpi_handle handle, | ||
470 | struct device *depdev) {} | ||
471 | static inline void acpi_dev_pm_remove_dependent(acpi_handle handle, | ||
472 | struct device *depdev) {} | ||
473 | #endif | 467 | #endif |
474 | 468 | ||
475 | #ifdef CONFIG_PM_RUNTIME | 469 | #ifdef CONFIG_PM_RUNTIME |