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, 8 insertions, 9 deletions

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 04c1b2d9b775..04cdeb8e3719 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -31,6 +31,8 @@
  * IN THE SOFTWARE.
  */
 
+#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -508,8 +510,7 @@ static void gnttab_handle_deferred(unsigned long unused)
                         entry = NULL;
                 } else {
                         if (!--entry->warn_delay)
-                                pr_info("g.e. %#x still pending\n",
-                                        entry->ref);
+                                pr_info("g.e. %#x still pending\n", entry->ref);
                         if (!first)
                                 first = entry;
                 }
@@ -838,7 +839,7 @@ gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
         } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
 
         if (delay >= MAX_DELAY) {
-                printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
+                pr_err("%s: %s eagain grant\n", func, current->comm);
                 *status = GNTST_bad_page;
         }
 }
@@ -1048,8 +1049,8 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
                         xatp.gpfn = (xen_hvm_resume_frames >> PAGE_SHIFT) + i;
                         rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp);
                         if (rc != 0) {
-                                printk(KERN_WARNING
-                                                "grant table add_to_physmap failed, err=%d\n", rc);
+                                pr_warn("grant table add_to_physmap failed, err=%d\n",
+                                        rc);
                                 break;
                         }
                 } while (i-- > start_idx);
@@ -1131,8 +1132,7 @@ static void gnttab_request_version(void)
                 grefs_per_grant_frame = PAGE_SIZE / sizeof(struct grant_entry_v1);
                 gnttab_interface = &gnttab_v1_ops;
         }
-        printk(KERN_INFO "Grant tables using version %d layout.\n",
-                grant_table_version);
+        pr_info("Grant tables using version %d layout\n", grant_table_version);
 }
 
 static int gnttab_setup(void)
@@ -1150,8 +1150,7 @@ static int gnttab_setup(void)
                 gnttab_shared.addr = xen_remap(xen_hvm_resume_frames,
                                                 PAGE_SIZE * max_nr_gframes);
                 if (gnttab_shared.addr == NULL) {
-                        printk(KERN_WARNING
-                                        "Failed to ioremap gnttab share frames!");
+                        pr_warn("Failed to ioremap gnttab share frames!\n");
                         return -ENOMEM;
                 }
         }