diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-23 10:33:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-23 10:33:44 +0200 |
| commit | f1a0b8310c99a0e3d579e61d81870caec058db46 (patch) | |
| tree | 6bfe155bb1f67c0c798428c93520eca8973738cf /include | |
| parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) | |
| parent | c8f6d8351ba8c89d5cd4c562552ec7ec29274e31 (diff) | |
| download | linux-f1a0b8310c99a0e3d579e61d81870caec058db46.tar.bz2 | |
Merge branch 'acpi-fixes'
* acpi-fixes:
ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist
ACPI / PM: Allow device power states to be used for CONFIG_PM unset
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 98db31d9f9b4..636c59f2003a 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -377,7 +377,6 @@ acpi_status acpi_bus_get_status_handle(acpi_handle handle, unsigned long long *sta); int acpi_bus_get_status(struct acpi_device *device); -#ifdef CONFIG_PM int acpi_bus_set_power(acpi_handle handle, int state); const char *acpi_power_state_string(int state); int acpi_device_get_power(struct acpi_device *device, int *state); @@ -385,41 +384,12 @@ int acpi_device_set_power(struct acpi_device *device, int state); int acpi_bus_init_power(struct acpi_device *device); int acpi_bus_update_power(acpi_handle handle, int *state_p); bool acpi_bus_power_manageable(acpi_handle handle); + +#ifdef CONFIG_PM bool acpi_bus_can_wakeup(acpi_handle handle); -#else /* !CONFIG_PM */ -static inline int acpi_bus_set_power(acpi_handle handle, int state) -{ - return 0; -} -static inline const char *acpi_power_state_string(int state) -{ - return "D0"; -} -static inline int acpi_device_get_power(struct acpi_device *device, int *state) -{ - return 0; -} -static inline int acpi_device_set_power(struct acpi_device *device, int state) -{ - return 0; -} -static inline int acpi_bus_init_power(struct acpi_device *device) -{ - return 0; -} -static inline int acpi_bus_update_power(acpi_handle handle, int *state_p) -{ - return 0; -} -static inline bool acpi_bus_power_manageable(acpi_handle handle) -{ - return false; -} -static inline bool acpi_bus_can_wakeup(acpi_handle handle) -{ - return false; -} -#endif /* !CONFIG_PM */ +#else +static inline bool acpi_bus_can_wakeup(acpi_handle handle) { return false; } +#endif #ifdef CONFIG_ACPI_PROC_EVENT int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data); |