1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index 88e677b0de74..b6d5fff43d16 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -31,6 +31,8 @@
  * IN THE SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/unistd.h>
 #include <linux/errno.h>
 #include <linux/types.h>
@@ -129,9 +131,8 @@ static int get_error(const char *errorstring)
 
         for (i = 0; strcmp(errorstring, xsd_errors[i].errstring) != 0; i++) {
                 if (i == ARRAY_SIZE(xsd_errors) - 1) {
-                        printk(KERN_WARNING
-                               "XENBUS xen store gave: unknown error %s",
-                               errorstring);
+                        pr_warn("xen store gave: unknown error %s\n",
+                                errorstring);
                         return EINVAL;
                 }
         }
@@ -272,10 +273,8 @@ static void *xs_talkv(struct xenbus_transaction t,
         }
 
         if (msg.type != type) {
-                if (printk_ratelimit())
-                        printk(KERN_WARNING
-                               "XENBUS unexpected type [%d], expected [%d]\n",
-                               msg.type, type);
+                pr_warn_ratelimited("unexpected type [%d], expected [%d]\n",
+                                    msg.type, type);
                 kfree(ret);
                 return ERR_PTR(-EINVAL);
         }
@@ -655,7 +654,7 @@ static void xs_reset_watches(void)
 
         err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL));
         if (err && err != -EEXIST)
-                printk(KERN_WARNING "xs_reset_watches failed: %d\n", err);
+                pr_warn("xs_reset_watches failed: %d\n", err);
 }
 
 /* Register callback to watch this node. */
@@ -705,9 +704,7 @@ void unregister_xenbus_watch(struct xenbus_watch *watch)
 
         err = xs_unwatch(watch->node, token);
         if (err)
-                printk(KERN_WARNING
-                       "XENBUS Failed to release watch %s: %i\n",
-                       watch->node, err);
+                pr_warn("Failed to release watch %s: %i\n", watch->node, err);
 
         up_read(&xs_state.watch_mutex);
 
@@ -901,8 +898,7 @@ static int xenbus_thread(void *unused)
         for (;;) {
                 err = process_msg();
                 if (err)
-                        printk(KERN_WARNING "XENBUS error %d while reading "
-                               "message\n", err);
+                        pr_warn("error %d while reading message\n", err);
                 if (kthread_should_stop())
                         break;
         }