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>

25 files changed, 158 insertions, 220 deletions

diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index 9fe434969fab..4353539fb887 100644
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
@@ -392,8 +392,7 @@ extern void ioport_unmap(void __iomem *addr);
 static inline long ioport_panic(void)
 {
 #ifdef __tilegx__
-        panic("PCI IO space support is disabled. Configure the kernel with"
-              " CONFIG_TILE_PCI_IO to enable it");
+        panic("PCI IO space support is disabled. Configure the kernel with CONFIG_TILE_PCI_IO to enable it");
 #else
         panic("inb/outb and friends do not exist on tile");
 #endif
@@ -402,7 +401,7 @@ static inline long ioport_panic(void)
 
 static inline void __iomem *ioport_map(unsigned long port, unsigned int len)
 {
-        pr_info("ioport_map: mapping IO resources is unsupported on tile.\n");
+        pr_info("ioport_map: mapping IO resources is unsupported on tile\n");
         return NULL;
 }
 
diff --git a/arch/tile/include/asm/pgtable.h b/arch/tile/include/asm/pgtable.h
index 33587f16c152..5d1950788c69 100644
--- a/arch/tile/include/asm/pgtable.h
+++ b/arch/tile/include/asm/pgtable.h
@@ -235,9 +235,9 @@ static inline void __pte_clear(pte_t *ptep)
 #define pte_donemigrate(x) hv_pte_set_present(hv_pte_clear_migrating(x))
 
 #define pte_ERROR(e) \
-        pr_err("%s:%d: bad pte 0x%016llx.\n", __FILE__, __LINE__, pte_val(e))
+        pr_err("%s:%d: bad pte 0x%016llx\n", __FILE__, __LINE__, pte_val(e))
 #define pgd_ERROR(e) \
-        pr_err("%s:%d: bad pgd 0x%016llx.\n", __FILE__, __LINE__, pgd_val(e))
+        pr_err("%s:%d: bad pgd 0x%016llx\n", __FILE__, __LINE__, pgd_val(e))
 
 /* Return PA and protection info for a given kernel VA. */
 int va_to_cpa_and_pte(void *va, phys_addr_t *cpa, pte_t *pte);
diff --git a/arch/tile/include/asm/pgtable_64.h b/arch/tile/include/asm/pgtable_64.h
index 2c8a9cd102d3..e96cec52f6d8 100644
--- a/arch/tile/include/asm/pgtable_64.h
+++ b/arch/tile/include/asm/pgtable_64.h
@@ -86,7 +86,7 @@ static inline int pud_huge_page(pud_t pud)
 }
 
 #define pmd_ERROR(e) \
-        pr_err("%s:%d: bad pmd 0x%016llx.\n", __FILE__, __LINE__, pmd_val(e))
+        pr_err("%s:%d: bad pmd 0x%016llx\n", __FILE__, __LINE__, pmd_val(e))
 
 static inline void pud_clear(pud_t *pudp)
 {
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index aca6000bca75..c4646bb99342 100644
--- a/arch/tile/kernel/hardwall.c
+++ b/arch/tile/kernel/hardwall.c
@@ -365,8 +365,7 @@ void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num)
          * to quiesce.
          */
         if (rect->teardown_in_progress) {
-                pr_notice("cpu %d: detected %s hardwall violation %#lx"
-                       " while teardown already in progress\n",
+                pr_notice("cpu %d: detected %s hardwall violation %#lx while teardown already in progress\n",
                           cpu, hwt->name,
                           (long)mfspr_XDN(hwt, DIRECTION_PROTECT));
                 goto done;
@@ -630,8 +629,7 @@ static void _hardwall_deactivate(struct hardwall_type *hwt,
         struct thread_struct *ts = &task->thread;
 
         if (cpumask_weight(&task->cpus_allowed) != 1) {
-                pr_err("pid %d (%s) releasing %s hardwall with"
-                       " an affinity mask containing %d cpus!\n",
+                pr_err("pid %d (%s) releasing %s hardwall with an affinity mask containing %d cpus!\n",
                        task->pid, task->comm, hwt->name,
                        cpumask_weight(&task->cpus_allowed));
                 BUG();
diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c
index ba85765e1436..22044fc691ef 100644
--- a/arch/tile/kernel/irq.c
+++ b/arch/tile/kernel/irq.c
@@ -107,9 +107,8 @@ void tile_dev_intr(struct pt_regs *regs, int intnum)
         {
                 long sp = stack_pointer - (long) current_thread_info();
                 if (unlikely(sp < (sizeof(struct thread_info) + STACK_WARN))) {
-                        pr_emerg("tile_dev_intr: "
-                               "stack overflow: %ld\n",
-                               sp - sizeof(struct thread_info));
+                        pr_emerg("%s: stack overflow: %ld\n",
+                                 __func__, sp - sizeof(struct thread_info));
                         dump_stack();
                 }
         }
diff --git a/arch/tile/kernel/kprobes.c b/arch/tile/kernel/kprobes.c
index 27cdcacbe81d..f8a45c51e9e4 100644
--- a/arch/tile/kernel/kprobes.c
+++ b/arch/tile/kernel/kprobes.c
@@ -90,8 +90,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
                 return -EINVAL;
 
         if (insn_has_control(*p->addr)) {
-                pr_notice("Kprobes for control instructions are not "
-                          "supported\n");
+                pr_notice("Kprobes for control instructions are not supported\n");
                 return -EINVAL;
         }
 
diff --git a/arch/tile/kernel/machine_kexec.c b/arch/tile/kernel/machine_kexec.c
index f0b54a934712..008aa2faef55 100644
--- a/arch/tile/kernel/machine_kexec.c
+++ b/arch/tile/kernel/machine_kexec.c
@@ -77,16 +77,13 @@ void machine_crash_shutdown(struct pt_regs *regs)
 int machine_kexec_prepare(struct kimage *image)
 {
         if (num_online_cpus() > 1) {
-                pr_warning("%s: detected attempt to kexec "
-                       "with num_online_cpus() > 1\n",
-                       __func__);
+                pr_warn("%s: detected attempt to kexec with num_online_cpus() > 1\n",
+                        __func__);
                 return -ENOSYS;
         }
         if (image->type != KEXEC_TYPE_DEFAULT) {
-                pr_warning("%s: detected attempt to kexec "
-                       "with unsupported type: %d\n",
-                       __func__,
-                       image->type);
+                pr_warn("%s: detected attempt to kexec with unsupported type: %d\n",
+                        __func__, image->type);
                 return -ENOSYS;
         }
         return 0;
@@ -131,8 +128,8 @@ static unsigned char *kexec_bn2cl(void *pg)
          */
         csum = ip_compute_csum(pg, bhdrp->b_size);
         if (csum != 0) {
-                pr_warning("%s: bad checksum %#x (size %d)\n",
-                           __func__, csum, bhdrp->b_size);
+                pr_warn("%s: bad checksum %#x (size %d)\n",
+                        __func__, csum, bhdrp->b_size);
                 return 0;
         }