diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-06-04 19:15:40 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-06-11 19:33:19 -0400 |
commit | 06166780eb53685e72b589814d535d1f9948e761 (patch) | |
tree | c4ba373d19f1755d9e8934c754753f52bc13997b /include/acpi/acpi_bus.h | |
parent | 28ffb5d3e0b563be5a9639c3a2b42f1a9430454f (diff) |
ACPI PM: acpi_pm_device_sleep_state() cleanup
Get rid of a superfluous acpi_pm_device_sleep_state() parameter. The
only legitimate value of that parameter must be derived from the first
parameter, which is what all the callers already do. (However, this
does not address the fact that ACPI still doesn't set up those flags.)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 2f1c68c7a727..db90a74f8714 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -376,9 +376,9 @@ acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | |||
376 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 376 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
377 | 377 | ||
378 | #ifdef CONFIG_PM_SLEEP | 378 | #ifdef CONFIG_PM_SLEEP |
379 | int acpi_pm_device_sleep_state(struct device *, int, int *); | 379 | int acpi_pm_device_sleep_state(struct device *, int *); |
380 | #else /* !CONFIG_PM_SLEEP */ | 380 | #else /* !CONFIG_PM_SLEEP */ |
381 | static inline int acpi_pm_device_sleep_state(struct device *d, int w, int *p) | 381 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p) |
382 | { | 382 | { |
383 | if (p) | 383 | if (p) |
384 | *p = ACPI_STATE_D0; | 384 | *p = ACPI_STATE_D0; |