[PATCH] swsusp: switch pm_message_t to struct

This adds type-checking to pm_message_t, so that people can't confuse it
with int or u32.  It also allows us to fix "disk yoyo" during suspend (disk
spinning down/up/down).

[We've tried that before; since that cpufreq problems were fixed and I've
tried make allyes config and fixed resulting damage.]

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Alexander Nyberg <alexn@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index bdd96b03b885..0a7aa07b9a2a 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -26,11 +26,11 @@ int resume_device(struct device * dev)
 
         down(&dev->sem);
         if (dev->power.pm_parent
-                        && dev->power.pm_parent->power.power_state) {
+                        && dev->power.pm_parent->power.power_state.event) {
                 dev_err(dev, "PM: resume from %d, parent %s still %d\n",
-                        dev->power.power_state,
+                        dev->power.power_state.event,
                         dev->power.pm_parent->bus_id,
-                        dev->power.pm_parent->power.power_state);
+                        dev->power.pm_parent->power.power_state.event);
         }
         if (dev->bus && dev->bus->resume) {
                 dev_dbg(dev,"resuming\n");
@@ -54,7 +54,7 @@ void dpm_resume(void)
                 list_add_tail(entry, &dpm_active);
 
                 up(&dpm_list_sem);
-                if (!dev->power.prev_state)
+                if (!dev->power.prev_state.event)
                         resume_device(dev);
                 down(&dpm_list_sem);
                 put_device(dev);