Merge back earlier suspend/hibernate material for v4.1.

2 files changed, 19 insertions, 7 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 9717d5f20139..3d874eca7104 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -23,7 +23,7 @@
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
-#include <linux/resume-trace.h>
+#include <linux/pm-trace.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/async.h>
@@ -1017,6 +1017,9 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
         char *info = NULL;
         int error = 0;
 
+        TRACE_DEVICE(dev);
+        TRACE_SUSPEND(0);
+
         if (async_error)
                 goto Complete;
 
@@ -1057,6 +1060,7 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
 
 Complete:
         complete_all(&dev->power.completion);
+        TRACE_SUSPEND(error);
         return error;
 }
 
@@ -1078,7 +1082,7 @@ static int device_suspend_noirq(struct device *dev)
 {
         reinit_completion(&dev->power.completion);
 
-        if (pm_async_enabled && dev->power.async_suspend) {
+        if (is_async(dev)) {
                 get_device(dev);
                 async_schedule(async_suspend_noirq, dev);
                 return 0;
@@ -1157,6 +1161,9 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
         char *info = NULL;
         int error = 0;
 
+        TRACE_DEVICE(dev);
+        TRACE_SUSPEND(0);
+
         __pm_runtime_disable(dev, false);
 
         if (async_error)
@@ -1198,6 +1205,7 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
                 async_error = error;
 
 Complete:
+        TRACE_SUSPEND(error);
         complete_all(&dev->power.completion);
         return error;
 }
@@ -1219,7 +1227,7 @@ static int device_suspend_late(struct device *dev)
 {
         reinit_completion(&dev->power.completion);
 
-        if (pm_async_enabled && dev->power.async_suspend) {
+        if (is_async(dev)) {
                 get_device(dev);
                 async_schedule(async_suspend_late, dev);
                 return 0;
@@ -1338,6 +1346,9 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         int error = 0;
         DECLARE_DPM_WATCHDOG_ON_STACK(wd);
 
+        TRACE_DEVICE(dev);
+        TRACE_SUSPEND(0);
+
         dpm_wait_for_children(dev, async);
 
         if (async_error)
@@ -1444,6 +1455,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         if (error)
                 async_error = error;
 
+        TRACE_SUSPEND(error);
         return error;
 }
 
@@ -1465,7 +1477,7 @@ static int device_suspend(struct device *dev)
 {
         reinit_completion(&dev->power.completion);
 
-        if (pm_async_enabled && dev->power.async_suspend) {
+        if (is_async(dev)) {
                 get_device(dev);
                 async_schedule(async_suspend, dev);
                 return 0;
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index d94a1f5121cf..a311cfa4c5bd 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -7,7 +7,7 @@
  * devices may be working.
  */
 
-#include <linux/resume-trace.h>
+#include <linux/pm-trace.h>
 #include <linux/export.h>
 #include <linux/rtc.h>
 
@@ -154,7 +154,7 @@ EXPORT_SYMBOL(set_trace_device);
  * it's not any guarantee, but it's a high _likelihood_ that
  * the match is valid).
  */
-void generate_resume_trace(const void *tracedata, unsigned int user)
+void generate_pm_trace(const void *tracedata, unsigned int user)
 {
         unsigned short lineno = *(unsigned short *)tracedata;
         const char *file = *(const char **)(tracedata + 2);
@@ -164,7 +164,7 @@ void generate_resume_trace(const void *tracedata, unsigned int user)
         file_hash_value = hash_string(lineno, file, FILEHASH);
         set_magic_time(user_hash_value, file_hash_value, dev_hash_value);
 }
-EXPORT_SYMBOL(generate_resume_trace);
+EXPORT_SYMBOL(generate_pm_trace);
 
 extern char __tracedata_start, __tracedata_end;
 static int show_file_hash(unsigned int value)