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>

1 files changed, 14 insertions, 22 deletions

diff --git a/drivers/xen/mcelog.c b/drivers/xen/mcelog.c
index 8feee08bcb43..6ab6a79c38a5 100644
--- a/drivers/xen/mcelog.c
+++ b/drivers/xen/mcelog.c
@@ -32,6 +32,8 @@
  * IN THE SOFTWARE.
  */
 
+#define pr_fmt(fmt) "xen_mcelog: " fmt
+
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -51,8 +53,6 @@
 #include <asm/xen/hypercall.h>
 #include <asm/xen/hypervisor.h>
 
-#define XEN_MCELOG "xen_mcelog: "
-
 static struct mc_info g_mi;
 static struct mcinfo_logical_cpu *g_physinfo;
 static uint32_t ncpus;
@@ -227,7 +227,7 @@ static int convert_log(struct mc_info *mi)
         mic = NULL;
         x86_mcinfo_lookup(&mic, mi, MC_TYPE_GLOBAL);
         if (unlikely(!mic)) {
-                pr_warning(XEN_MCELOG "Failed to find global error info\n");
+                pr_warn("Failed to find global error info\n");
                 return -ENODEV;
         }
 
@@ -241,8 +241,7 @@ static int convert_log(struct mc_info *mi)
                 if (g_physinfo[i].mc_apicid == m.apicid)
                         break;
         if (unlikely(i == ncpus)) {
-                pr_warning(XEN_MCELOG "Failed to match cpu with apicid %d\n",
-                           m.apicid);
+                pr_warn("Failed to match cpu with apicid %d\n", m.apicid);
                 return -ENODEV;
         }
 
@@ -254,7 +253,7 @@ static int convert_log(struct mc_info *mi)
         mic = NULL;
         x86_mcinfo_lookup(&mic, mi, MC_TYPE_BANK);
         if (unlikely(!mic)) {
-                pr_warning(XEN_MCELOG "Fail to find bank error info\n");
+                pr_warn("Fail to find bank error info\n");
                 return -ENODEV;
         }
 
@@ -295,9 +294,8 @@ static int mc_queue_handle(uint32_t flags)
                 mc_op.u.mc_fetch.flags = flags;
                 ret = HYPERVISOR_mca(&mc_op);
                 if (ret) {
-                        pr_err(XEN_MCELOG "Failed to fetch %s error log\n",
-                               (flags == XEN_MC_URGENT) ?
-                               "urgnet" : "nonurgent");
+                        pr_err("Failed to fetch %surgent error log\n",
+                               flags == XEN_MC_URGENT ? "" : "non");
                         break;
                 }
 
@@ -307,15 +305,12 @@ static int mc_queue_handle(uint32_t flags)
                 else {
                         ret = convert_log(&g_mi);
                         if (ret)
-                                pr_warning(XEN_MCELOG
-                                           "Failed to convert this error log, "
-                                           "continue acking it anyway\n");
+                                pr_warn("Failed to convert this error log, continue acking it anyway\n");
 
                         mc_op.u.mc_fetch.flags = flags | XEN_MC_ACK;
                         ret = HYPERVISOR_mca(&mc_op);
                         if (ret) {
-                                pr_err(XEN_MCELOG
-                                       "Failed to ack previous error log\n");
+                                pr_err("Failed to ack previous error log\n");
                                 break;
                         }
                 }
@@ -334,15 +329,12 @@ static void xen_mce_work_fn(struct work_struct *work)
         /* urgent mc_info */
         err = mc_queue_handle(XEN_MC_URGENT);
         if (err)
-                pr_err(XEN_MCELOG
-                       "Failed to handle urgent mc_info queue, "
-                       "continue handling nonurgent mc_info queue anyway.\n");
+                pr_err("Failed to handle urgent mc_info queue, continue handling nonurgent mc_info queue anyway\n");
 
         /* nonurgent mc_info */
         err = mc_queue_handle(XEN_MC_NONURGENT);
         if (err)
-                pr_err(XEN_MCELOG
-                       "Failed to handle nonurgent mc_info queue.\n");
+                pr_err("Failed to handle nonurgent mc_info queue\n");
 
         /* wake processes polling /dev/mcelog */
         wake_up_interruptible(&xen_mce_chrdev_wait);
@@ -370,7 +362,7 @@ static int bind_virq_for_mce(void)
         set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
         ret = HYPERVISOR_mca(&mc_op);
         if (ret) {
-                pr_err(XEN_MCELOG "Failed to get CPU numbers\n");
+                pr_err("Failed to get CPU numbers\n");
                 return ret;
         }
 
@@ -383,7 +375,7 @@ static int bind_virq_for_mce(void)
         set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
         ret = HYPERVISOR_mca(&mc_op);
         if (ret) {
-                pr_err(XEN_MCELOG "Failed to get CPU info\n");
+                pr_err("Failed to get CPU info\n");
                 kfree(g_physinfo);
                 return ret;
         }
@@ -391,7 +383,7 @@ static int bind_virq_for_mce(void)
         ret  = bind_virq_to_irqhandler(VIRQ_MCA, 0,
                                        xen_mce_interrupt, 0, "mce", NULL);
         if (ret < 0) {
-                pr_err(XEN_MCELOG "Failed to bind virq\n");
+                pr_err("Failed to bind virq\n");
                 kfree(g_physinfo);
                 return ret;
         }