4 files changed, 19 insertions, 13 deletions

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 0a7aa07b9a2a..317edbf0feca 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -9,10 +9,9 @@
  */
 
 #include <linux/device.h>
+#include "../base.h"
 #include "power.h"
 
-extern int sysdev_resume(void);
-
 
 /**
  *      resume_device - Restore state for one device.
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
index c2475f3134ea..8826a5b6673e 100644
--- a/drivers/base/power/shutdown.c
+++ b/drivers/base/power/shutdown.c
@@ -12,6 +12,7 @@
 #include <linux/device.h>
 #include <asm/semaphore.h>
 
+#include "../base.h"
 #include "power.h"
 
 #define to_dev(node) container_of(node, struct device, kobj.entry)
@@ -28,7 +29,6 @@ extern struct subsystem devices_subsys;
  * they only get one called once when interrupts are disabled.
  */
 
-extern int sysdev_shutdown(void);
 
 /**
  * device_shutdown - call ->shutdown() on each device to shutdown.
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 50501764d050..8660779fb288 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -9,10 +9,9 @@
  */
 
 #include <linux/device.h>
+#include "../base.h"
 #include "power.h"
 
-extern int sysdev_suspend(pm_message_t state);
-
 /*
  * The entries in the dpm_active list are in a depth first order, simply
  * because children are guaranteed to be discovered after parents, and
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index f3a0c562bcb5..40d7242a07c1 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -27,22 +27,30 @@
 
 static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
-        return sprintf(buf, "%u\n", dev->power.power_state.event);
+        if (dev->power.power_state.event)
+                return sprintf(buf, "2\n");
+        else
+                return sprintf(buf, "0\n");
 }
 
 static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
 {
         pm_message_t state;
-        char * rest;
-        int error = 0;
+        int error = -EINVAL;
 
-        state.event = simple_strtoul(buf, &rest, 10);
-        if (*rest)
-                return -EINVAL;
-        if (state.event)
+        state.event = PM_EVENT_SUSPEND;
+        /* Older apps expected to write "3" here - confused with PCI D3 */
+        if ((n == 1) && !strcmp(buf, "3"))
                 error = dpm_runtime_suspend(dev, state);
-        else
+
+        if ((n == 1) && !strcmp(buf, "2"))
+                error = dpm_runtime_suspend(dev, state);
+
+        if ((n == 1) && !strcmp(buf, "0")) {
                 dpm_runtime_resume(dev);
+                error = 0;
+        }
+
         return error ? error : n;
 }