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, 2 insertions, 4 deletions

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();