Merge branch 'linus' into release

1 files changed, 4 insertions, 7 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index b8f7ce9473e8..239988873971 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -22,7 +22,6 @@
 #include <linux/freezer.h>
 #include <linux/vmstat.h>
 #include <linux/syscalls.h>
-#include <linux/ftrace.h>
 
 #include "power.h"
 
@@ -317,7 +316,7 @@ static int suspend_enter(suspend_state_t state)
  */
 int suspend_devices_and_enter(suspend_state_t state)
 {
-        int error, ftrace_save;
+        int error;
 
         if (!suspend_ops)
                 return -ENOSYS;
@@ -328,7 +327,6 @@ int suspend_devices_and_enter(suspend_state_t state)
                         goto Close;
         }
         suspend_console();
-        ftrace_save = __ftrace_enabled_save();
         suspend_test_start();
         error = device_suspend(PMSG_SUSPEND);
         if (error) {
@@ -360,7 +358,6 @@ int suspend_devices_and_enter(suspend_state_t state)
         suspend_test_start();
         device_resume(PMSG_RESUME);
         suspend_test_finish("resume devices");
-        __ftrace_enabled_restore(ftrace_save);
         resume_console();
  Close:
         if (suspend_ops->end)
@@ -618,7 +615,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
         /* this may fail if the RTC hasn't been initialized */
         status = rtc_read_time(rtc, &alm.time);
         if (status < 0) {
-                printk(err_readtime, rtc->dev.bus_id, status);
+                printk(err_readtime, dev_name(&rtc->dev), status);
                 return;
         }
         rtc_tm_to_time(&alm.time, &now);
@@ -629,7 +626,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
 
         status = rtc_set_alarm(rtc, &alm);
         if (status < 0) {
-                printk(err_wakealarm, rtc->dev.bus_id, status);
+                printk(err_wakealarm, dev_name(&rtc->dev), status);
                 return;
         }
 
@@ -663,7 +660,7 @@ static int __init has_wakealarm(struct device *dev, void *name_ptr)
         if (!device_may_wakeup(candidate->dev.parent))
                 return 0;
 
-        *(char **)name_ptr = dev->bus_id;
+        *(const char **)name_ptr = dev_name(dev);
         return 1;
 }