summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2005-10-30 15:00:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:15 -0800
commiteb9289eb20df6b54214c45ac7c6bf5179a149026 (patch)
treedac51cecdd94e0c7273c990259ddd800057311b9 /drivers/acpi
parent0245b3e787dc3267a915e1f56419e7e9c197e148 (diff)
downloadlinux-3.10-eb9289eb20df6b54214c45ac7c6bf5179a149026.tar.gz
linux-3.10-eb9289eb20df6b54214c45ac7c6bf5179a149026.tar.bz2
linux-3.10-eb9289eb20df6b54214c45ac7c6bf5179a149026.zip
[PATCH] introduce .valid callback for pm_ops
Add pm_ops.valid callback, so only the available pm states show in /sys/power/state. And this also makes an earlier states error report at enter_state before we do actual suspend/resume. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Acked-by: Pavel Machek<pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep/main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index aee50b45326..930427fc0c4 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -158,7 +158,15 @@ int acpi_suspend(u32 acpi_state)
return -EINVAL;
}
+static int acpi_pm_state_valid(suspend_state_t pm_state)
+{
+ u32 acpi_state = acpi_suspend_states[pm_state];
+
+ return sleep_states[acpi_state];
+}
+
static struct pm_ops acpi_pm_ops = {
+ .valid = acpi_pm_state_valid,
.prepare = acpi_pm_prepare,
.enter = acpi_pm_enter,
.finish = acpi_pm_finish,