1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index b1005d4a953d..9385b4524547 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -1,6 +1,9 @@
 /*
  * Handle extern requests for shutdown, reboot and sysrq
  */
+
+#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/slab.h>
@@ -73,8 +76,7 @@ static int xen_suspend(void *data)
 
         err = syscore_suspend();
         if (err) {
-                printk(KERN_ERR "xen_suspend: system core suspend failed: %d\n",
-                        err);
+                pr_err("%s: system core suspend failed: %d\n", __func__, err);
                 return err;
         }
 
@@ -115,14 +117,14 @@ static void do_suspend(void)
            during suspend. */
         err = freeze_processes();
         if (err) {
-                printk(KERN_ERR "xen suspend: freeze failed %d\n", err);
+                pr_err("%s: freeze failed %d\n", __func__, err);
                 goto out;
         }
 #endif
 
         err = dpm_suspend_start(PMSG_FREEZE);
         if (err) {
-                printk(KERN_ERR "xen suspend: dpm_suspend_start %d\n", err);
+                pr_err("%s: dpm_suspend_start %d\n", __func__, err);
                 goto out_thaw;
         }
 
@@ -131,7 +133,7 @@ static void do_suspend(void)
 
         err = dpm_suspend_end(PMSG_FREEZE);
         if (err) {
-                printk(KERN_ERR "dpm_suspend_end failed: %d\n", err);
+                pr_err("dpm_suspend_end failed: %d\n", err);
                 si.cancelled = 0;
                 goto out_resume;
         }
@@ -153,7 +155,7 @@ static void do_suspend(void)
         dpm_resume_start(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
 
         if (err) {
-                printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
+                pr_err("failed to start xen_suspend: %d\n", err);
                 si.cancelled = 1;
         }
 
@@ -245,7 +247,7 @@ static void shutdown_handler(struct xenbus_watch *watch,
         if (handler->cb) {
                 handler->cb();
         } else {
-                printk(KERN_INFO "Ignoring shutdown request: %s\n", str);
+                pr_info("Ignoring shutdown request: %s\n", str);
                 shutting_down = SHUTDOWN_INVALID;
         }
 
@@ -265,8 +267,7 @@ static void sysrq_handler(struct xenbus_watch *watch, const char **vec,
         if (err)
                 return;
         if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) {
-                printk(KERN_ERR "Unable to read sysrq code in "
-                       "control/sysrq\n");
+                pr_err("Unable to read sysrq code in control/sysrq\n");
                 xenbus_transaction_end(xbt, 1);
                 return;
         }
@@ -299,14 +300,14 @@ static int setup_shutdown_watcher(void)
 
         err = register_xenbus_watch(&shutdown_watch);
         if (err) {
-                printk(KERN_ERR "Failed to set shutdown watcher\n");
+                pr_err("Failed to set shutdown watcher\n");
                 return err;
         }
 
 #ifdef CONFIG_MAGIC_SYSRQ
         err = register_xenbus_watch(&sysrq_watch);
         if (err) {
-                printk(KERN_ERR "Failed to set sysrq watcher\n");
+                pr_err("Failed to set sysrq watcher\n");
                 return err;
         }
 #endif