tile: Use the more common pr_warn instead of pr_warning

And other message logging neatening.

Other miscellanea:

o coalesce formats
o realign arguments
o standardize a couple of macros
o use __func__ instead of embedding the function name

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

1 files changed, 10 insertions, 12 deletions

diff --git a/arch/tile/kernel/unaligned.c b/arch/tile/kernel/unaligned.c
index c02ea2a45f67..7d9a83be0aca 100644
--- a/arch/tile/kernel/unaligned.c
+++ b/arch/tile/kernel/unaligned.c
@@ -969,8 +969,7 @@ void jit_bundle_gen(struct pt_regs *regs, tilegx_bundle_bits bundle,
                 unaligned_fixup_count++;
 
                 if (unaligned_printk) {
-                        pr_info("%s/%d. Unalign fixup for kernel access "
-                                "to userspace %lx.",
+                        pr_info("%s/%d - Unalign fixup for kernel access to userspace %lx\n",
                                 current->comm, current->pid, regs->regs[ra]);
                 }
 
@@ -985,7 +984,7 @@ void jit_bundle_gen(struct pt_regs *regs, tilegx_bundle_bits bundle,
                         .si_addr = (unsigned char __user *)0
                 };
                 if (unaligned_printk)
-                        pr_info("Unalign bundle: unexp @%llx, %llx",
+                        pr_info("Unalign bundle: unexp @%llx, %llx\n",
                                 (unsigned long long)regs->pc,
                                 (unsigned long long)bundle);
 
@@ -1370,8 +1369,7 @@ void jit_bundle_gen(struct pt_regs *regs, tilegx_bundle_bits bundle,
                 frag.bundle = bundle;
 
                 if (unaligned_printk) {
-                        pr_info("%s/%d, Unalign fixup: pc=%lx "
-                                "bundle=%lx %d %d %d %d %d %d %d %d.",
+                        pr_info("%s/%d, Unalign fixup: pc=%lx bundle=%lx %d %d %d %d %d %d %d %d\n",
                                 current->comm, current->pid,
                                 (unsigned long)frag.pc,
                                 (unsigned long)frag.bundle,
@@ -1380,8 +1378,8 @@ void jit_bundle_gen(struct pt_regs *regs, tilegx_bundle_bits bundle,
                                 (int)y1_lr, (int)y1_br, (int)x1_add);
 
                         for (k = 0; k < n; k += 2)
-                                pr_info("[%d] %016llx %016llx", k,
-                                        (unsigned long long)frag.insn[k],
+                                pr_info("[%d] %016llx %016llx\n",
+                                        k, (unsigned long long)frag.insn[k],
                                         (unsigned long long)frag.insn[k+1]);
                 }
 
@@ -1402,7 +1400,7 @@ void jit_bundle_gen(struct pt_regs *regs, tilegx_bundle_bits bundle,
                                 .si_addr = (void __user *)&jit_code_area[idx]
                         };
 
-                        pr_warn("Unalign fixup: pid=%d %s jit_code_area=%llx",
+                        pr_warn("Unalign fixup: pid=%d %s jit_code_area=%llx\n",
                                 current->pid, current->comm,
                                 (unsigned long long)&jit_code_area[idx]);
 
@@ -1485,7 +1483,7 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
                         /* If exception came from kernel, try fix it up. */
                         if (fixup_exception(regs)) {
                                 if (unaligned_printk)
-                                        pr_info("Unalign fixup: %d %llx @%llx",
+                                        pr_info("Unalign fixup: %d %llx @%llx\n",
                                                 (int)unaligned_fixup,
                                                 (unsigned long long)regs->ex1,
                                                 (unsigned long long)regs->pc);
@@ -1519,7 +1517,7 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
                 };
 
                 if (unaligned_printk)
-                        pr_info("Unalign fixup: %d %llx @%llx",
+                        pr_info("Unalign fixup: %d %llx @%llx\n",
                                 (int)unaligned_fixup,
                                 (unsigned long long)regs->ex1,
                                 (unsigned long long)regs->pc);
@@ -1579,14 +1577,14 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
                                                     0);
 
                 if (IS_ERR((void __force *)user_page)) {
-                        pr_err("Out of kernel pages trying do_mmap.\n");
+                        pr_err("Out of kernel pages trying do_mmap\n");
                         return;
                 }
 
                 /* Save the address in the thread_info struct */
                 info->unalign_jit_base = user_page;
                 if (unaligned_printk)
-                        pr_info("Unalign bundle: %d:%d, allocate page @%llx",
+                        pr_info("Unalign bundle: %d:%d, allocate page @%llx\n",
                                 raw_smp_processor_id(), current->pid,
                                 (unsigned long long)user_page);
         }