4 files changed, 18 insertions, 18 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);
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 325962d80191..e8f0519f5dfa 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -13,10 +13,10 @@
 static void runtime_resume(struct device * dev)
 {
         dev_dbg(dev, "resuming\n");
-        if (!dev->power.power_state)
+        if (!dev->power.power_state.event)
                 return;
         if (!resume_device(dev))
-                dev->power.power_state = 0;
+                dev->power.power_state = PMSG_ON;
 }
 
 
@@ -49,10 +49,10 @@ int dpm_runtime_suspend(struct device * dev, pm_message_t state)
         int error = 0;
 
         down(&dpm_sem);
-        if (dev->power.power_state == state)
+        if (dev->power.power_state.event == state.event)
                 goto Done;
 
-        if (dev->power.power_state)
+        if (dev->power.power_state.event)
                 runtime_resume(dev);
 
         if (!(error = suspend_device(dev, state)))
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 2ccee3763acf..50501764d050 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -40,22 +40,22 @@ int suspend_device(struct device * dev, pm_message_t state)
         int error = 0;
 
         down(&dev->sem);
-        if (dev->power.power_state) {
+        if (dev->power.power_state.event) {
                 dev_dbg(dev, "PM: suspend %d-->%d\n",
-                        dev->power.power_state, state);
+                        dev->power.power_state.event, state.event);
         }
         if (dev->power.pm_parent
-                        && dev->power.pm_parent->power.power_state) {
+                        && dev->power.pm_parent->power.power_state.event) {
                 dev_err(dev,
                         "PM: suspend %d->%d, parent %s already %d\n",
-                        dev->power.power_state, state,
+                        dev->power.power_state.event, state.event,
                         dev->power.pm_parent->bus_id,
-                        dev->power.pm_parent->power.power_state);
+                        dev->power.pm_parent->power.power_state.event);
         }
 
         dev->power.prev_state = dev->power.power_state;
 
-        if (dev->bus && dev->bus->suspend && !dev->power.power_state) {
+        if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
                 dev_dbg(dev, "suspending\n");
                 error = dev->bus->suspend(dev, state);
         }
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index f82b3df9545f..8d04fb435c17 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -26,19 +26,19 @@
 
 static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
-        return sprintf(buf, "%u\n", dev->power.power_state);
+        return sprintf(buf, "%u\n", dev->power.power_state.event);
 }
 
 static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
 {
-        u32 state;
+        pm_message_t state;
         char * rest;
         int error = 0;
 
-        state = simple_strtoul(buf, &rest, 10);
+        state.event = simple_strtoul(buf, &rest, 10);
         if (*rest)
                 return -EINVAL;
-        if (state)
+        if (state.event)
                 error = dpm_runtime_suspend(dev, state);
         else
                 dpm_runtime_resume(dev);