[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>

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index aee50b453265905d22442992afc6f4701177a98e..930427fc0c4b33ff923a5623038adcdf7073ea1c 100644 (file)
--- 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,

diff --git a/include/linux/pm.h b/include/linux/pm.h
index c61d5de837efaf4fa38829ab417f1993ad70f5b6..1514098d156d897ba02956517bc544f7626f5f87 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -170,6 +170,7 @@ typedef int __bitwise suspend_disk_method_t;
 
 struct pm_ops {
        suspend_disk_method_t pm_disk_mode;
+       int (*valid)(suspend_state_t state);
        int (*prepare)(suspend_state_t state);
        int (*enter)(suspend_state_t state);
        int (*finish)(suspend_state_t state);

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 22bdc93cc03885096a5e29755e5f3f5aeadee68a..18d7d693fbba852c48acc40de4ad8809baf5d36e 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -167,6 +167,8 @@ static int enter_state(suspend_state_t state)
 {
        int error;
 
+       if (pm_ops->valid && !pm_ops->valid(state))
+               return -ENODEV;
        if (down_trylock(&pm_sem))
                return -EBUSY;
 
@@ -236,7 +238,8 @@ static ssize_t state_show(struct subsystem * subsys, char * buf)
        char * s = buf;
 
        for (i = 0; i < PM_SUSPEND_MAX; i++) {
-               if (pm_states[i])
+               if (pm_states[i] && pm_ops && (!pm_ops->valid
+                       ||(pm_ops->valid && pm_ops->valid(i))))
                        s += sprintf(s,"%s ",pm_states[i]);
        }
        s += sprintf(s,"\n");