xen: Convert printks to pr_<level>

Convert printks to pr_<level> (excludes printk(KERN_DEBUG...)
to be more consistent throughout the xen subsystem.

Add pr_fmt with KBUILD_MODNAME or "xen:" KBUILD_MODNAME
Coalesce formats and add missing word spaces
Add missing newlines
Align arguments and reflow to 80 columns
Remove DRV_NAME from formats as pr_fmt adds the same content

This does change some of the prefixes of these messages
but it also does make them more consistent.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

7 files changed, 58 insertions, 58 deletions

diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c
index c5aa55c5d371..fdb0f339d0a7 100644
--- a/drivers/xen/xenbus/xenbus_comms.c
+++ b/drivers/xen/xenbus/xenbus_comms.c
@@ -30,6 +30,8 @@
  * IN THE SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/wait.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
@@ -205,13 +207,12 @@ int xb_init_comms(void)
         struct xenstore_domain_interface *intf = xen_store_interface;
 
         if (intf->req_prod != intf->req_cons)
-                printk(KERN_ERR "XENBUS request ring is not quiescent "
-                       "(%08x:%08x)!\n", intf->req_cons, intf->req_prod);
+                pr_err("request ring is not quiescent (%08x:%08x)!\n",
+                       intf->req_cons, intf->req_prod);
 
         if (intf->rsp_prod != intf->rsp_cons) {
-                printk(KERN_WARNING "XENBUS response ring is not quiescent "
-                       "(%08x:%08x): fixing up\n",
-                       intf->rsp_cons, intf->rsp_prod);
+                pr_warn("response ring is not quiescent (%08x:%08x): fixing up\n",
+                        intf->rsp_cons, intf->rsp_prod);
                 /* breaks kdump */
                 if (!reset_devices)
                         intf->rsp_cons = intf->rsp_prod;
@@ -225,7 +226,7 @@ int xb_init_comms(void)
                 err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting,
                                                 0, "xenbus", &xb_waitq);
                 if (err < 0) {
-                        printk(KERN_ERR "XENBUS request irq failed %i\n", err);
+                        pr_err("request irq failed %i\n", err);
                         return err;
                 }
 
diff --git a/drivers/xen/xenbus/xenbus_dev_backend.c b/drivers/xen/xenbus/xenbus_dev_backend.c
index a6f42fc01407..b17707ee07d4 100644
--- a/drivers/xen/xenbus/xenbus_dev_backend.c
+++ b/drivers/xen/xenbus/xenbus_dev_backend.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/mm.h>
@@ -127,7 +129,7 @@ static int __init xenbus_backend_init(void)
 
         err = misc_register(&xenbus_backend_dev);
         if (err)
-                printk(KERN_ERR "Could not register xenbus backend device\n");
+                pr_err("Could not register xenbus backend device\n");
         return err;
 }
 
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index ac727028e658..85534ea63555 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -35,6 +35,8 @@
  *                              Turned xenfs into a loadable module.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/uio.h>
@@ -616,7 +618,7 @@ static int __init xenbus_init(void)
 
         err = misc_register(&xenbus_dev);
         if (err)
-                printk(KERN_ERR "Could not register xenbus frontend device\n");
+                pr_err("Could not register xenbus frontend device\n");
         return err;
 }
 
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 56cfaaa9d006..cb1afc00c96d 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -30,6 +30,8 @@
  * IN THE SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define DPRINTK(fmt, args...)                           \
         pr_debug("xenbus_probe (%s:%d) " fmt ".\n",     \
                  __func__, __LINE__, ##args)
@@ -280,15 +282,15 @@ void xenbus_dev_shutdown(struct device *_dev)
 
         get_device(&dev->dev);
         if (dev->state != XenbusStateConnected) {
-                printk(KERN_INFO "%s: %s: %s != Connected, skipping\n", __func__,
-                       dev->nodename, xenbus_strstate(dev->state));
+                pr_info("%s: %s: %s != Connected, skipping\n",
+                        __func__, dev->nodename, xenbus_strstate(dev->state));
                 goto out;
         }
         xenbus_switch_state(dev, XenbusStateClosing);
         timeout = wait_for_completion_timeout(&dev->down, timeout);
         if (!timeout)
-                printk(KERN_INFO "%s: %s timeout closing device\n",
-                       __func__, dev->nodename);
+                pr_info("%s: %s timeout closing device\n",
+                        __func__, dev->nodename);
  out:
         put_device(&dev->dev);
 }
@@ -579,8 +581,7 @@ int xenbus_dev_suspend(struct device *dev)
         if (drv->suspend)
                 err = drv->suspend(xdev);
         if (err)
-                printk(KERN_WARNING
-                       "xenbus: suspend %s failed: %i\n", dev_name(dev), err);
+                pr_warn("suspend %s failed: %i\n", dev_name(dev), err);
         return 0;
 }
 EXPORT_SYMBOL_GPL(xenbus_dev_suspend);
@@ -599,9 +600,8 @@ int xenbus_dev_resume(struct device *dev)
         drv = to_xenbus_driver(dev->driver);
         err = talk_to_otherend(xdev);
         if (err) {
-                printk(KERN_WARNING
-                       "xenbus: resume (talk_to_otherend) %s failed: %i\n",
-                       dev_name(dev), err);
+                pr_warn("resume (talk_to_otherend) %s failed: %i\n",
+                        dev_name(dev), err);
                 return err;
         }
 
@@ -610,18 +610,15 @@ int xenbus_dev_resume(struct device *dev)
         if (drv->resume) {
                 err = drv->resume(xdev);
                 if (err) {
-                        printk(KERN_WARNING
-                               "xenbus: resume %s failed: %i\n",
-                               dev_name(dev), err);
+                        pr_warn("resume %s failed: %i\n", dev_name(dev), err);
                         return err;
                 }
         }
 
         err = watch_otherend(xdev);
         if (err) {
-                printk(KERN_WARNING
-                       "xenbus_probe: resume (watch_otherend) %s failed: "
-                       "%d.\n", dev_name(dev), err);
+                pr_warn("resume (watch_otherend) %s failed: %d.\n",
+                        dev_name(dev), err);
                 return err;
         }
 
@@ -776,8 +773,7 @@ static int __init xenbus_init(void)
         /* Initialize the interface to xenstore. */
         err = xs_init();
         if (err) {
-                printk(KERN_WARNING
-                       "XENBUS: Error initializing xenstore comms: %i\n", err);
+                pr_warn("Error initializing xenstore comms: %i\n", err);
                 goto out_error;
         }
 
diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c
index 257be37d9091..998bbbab816b 100644
--- a/drivers/xen/xenbus/xenbus_probe_backend.c
+++ b/drivers/xen/xenbus/xenbus_probe_backend.c
@@ -31,9 +31,11 @@
  * IN THE SOFTWARE.
  */
 
-#define DPRINTK(fmt, args...)                           \
-        pr_debug("xenbus_probe (%s:%d) " fmt ".\n",     \
-                 __func__, __LINE__, ##args)
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#define DPRINTK(fmt, ...)                               \
+        pr_debug("(%s:%d) " fmt "\n",                   \
+                 __func__, __LINE__, ##__VA_ARGS__)
 
 #include <linux/kernel.h>
 #include <linux/err.h>
diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
index a7e25073de19..6ed8a9df4472 100644
--- a/drivers/xen/xenbus/xenbus_probe_frontend.c
+++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
@@ -1,6 +1,8 @@
-#define DPRINTK(fmt, args...)                           \
-        pr_debug("xenbus_probe (%s:%d) " fmt ".\n",     \
-                 __func__, __LINE__, ##args)
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#define DPRINTK(fmt, ...)                               \
+        pr_debug("(%s:%d) " fmt "\n",                   \
+                 __func__, __LINE__, ##__VA_ARGS__)
 
 #include <linux/kernel.h>
 #include <linux/err.h>
@@ -36,13 +38,13 @@ static int frontend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename)
 {
         nodename = strchr(nodename, '/');
         if (!nodename || strlen(nodename + 1) >= XEN_BUS_ID_SIZE) {
-                printk(KERN_WARNING "XENBUS: bad frontend %s\n", nodename);
+                pr_warn("bad frontend %s\n", nodename);
                 return -EINVAL;
         }
 
         strlcpy(bus_id, nodename + 1, XEN_BUS_ID_SIZE);
         if (!strchr(bus_id, '/')) {
-                printk(KERN_WARNING "XENBUS: bus_id %s no slash\n", bus_id);
+                pr_warn("bus_id %s no slash\n", bus_id);
                 return -EINVAL;
         }
         *strchr(bus_id, '/') = '-';
@@ -234,15 +236,13 @@ static int print_device_status(struct device *dev, void *data)
 
         if (!dev->driver) {
                 /* Information only: is this too noisy? */
-                printk(KERN_INFO "XENBUS: Device with no driver: %s\n",
-                       xendev->nodename);
+                pr_info("Device with no driver: %s\n", xendev->nodename);
         } else if (xendev->state < XenbusStateConnected) {
                 enum xenbus_state rstate = XenbusStateUnknown;
                 if (xendev->otherend)
                         rstate = xenbus_read_driver_state(xendev->otherend);
-                printk(KERN_WARNING "XENBUS: Timeout connecting "
-                       "to device: %s (local state %d, remote state %d)\n",
-                       xendev->nodename, xendev->state, rstate);
+                pr_warn("Timeout connecting to device: %s (local state %d, remote state %d)\n",
+                        xendev->nodename, xendev->state, rstate);
         }
 
         return 0;
@@ -256,12 +256,13 @@ static bool wait_loop(unsigned long start, unsigned int max_delay,
 {
         if (time_after(jiffies, start + (*seconds_waited+5)*HZ)) {
                 if (!*seconds_waited)
-                        printk(KERN_WARNING "XENBUS: Waiting for "
-                               "devices to initialise: ");
+                        pr_warn("Waiting for devices to initialise: ");
                 *seconds_waited += 5;
-                printk("%us...", max_delay - *seconds_waited);
-                if (*seconds_waited == max_delay)
+                pr_cont("%us...", max_delay - *seconds_waited);
+                if (*seconds_waited == max_delay) {
+                        pr_cont("\n");
                         return true;
+                }
         }
 
         schedule_timeout_interruptible(HZ/10);
@@ -342,7 +343,7 @@ static void xenbus_reset_wait_for_backend(char *be, int expected)
         timeout = wait_event_interruptible_timeout(backend_state_wq,
                         backend_state == expected, 5 * HZ);
         if (timeout <= 0)
-                printk(KERN_INFO "XENBUS: backend %s timed out.\n", be);
+                pr_info("backend %s timed out\n", be);
 }
 
 /*
@@ -365,7 +366,7 @@ static void xenbus_reset_frontend(char *fe, char *be, int be_state)
         be_watch.callback = xenbus_reset_backend_state_changed;
         backend_state = XenbusStateUnknown;
 
-        printk(KERN_INFO "XENBUS: triggering reconnect on %s\n", be);
+        pr_info("triggering reconnect on %s\n", be);
         register_xenbus_watch(&be_watch);
 
         /* fall through to forward backend to state XenbusStateInitialising */
@@ -384,7 +385,7 @@ static void xenbus_reset_frontend(char *fe, char *be, int be_state)
         }
 
         unregister_xenbus_watch(&be_watch);
-        printk(KERN_INFO "XENBUS: reconnect done on %s\n", be);
+        pr_info("reconnect done on %s\n", be);
         kfree(be_watch.node);
 }
 
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;
         }