xtensa: clean up files to make them code-style compliant

Remove heading and trailing spaces, trim trailing lines, and wrap lines
that are longer than 80 characters.

Signed-off-by: Chris Zankel <chris@zankel.net>

14 files changed, 33 insertions, 42 deletions

diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index f36cef5a62f..c3a59d992ac 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -23,13 +23,13 @@ obj-$(CONFIG_MODULES) += xtensa_ksyms.o module.o
 #
 # Replicate rules in scripts/Makefile.build
 
-sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g'    \
-        -e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g' \
+sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g' \
+        -e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g'       \
         -e 's/\*(\(\.text\.[a-z]*\))/*(\1.literal \1)/g'
 
 quiet_cmd__cpp_lds_S = LDS     $@
-      cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ $< \
-                       | sed $(sed-y) >$@
+cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ $<    \
+                 | sed $(sed-y) >$@
 
 $(obj)/vmlinux.lds: $(src)/vmlinux.lds.S FORCE
         $(call if_changed_dep,_cpp_lds_S)
diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S
index 39d2f597382..aa2e87b8566 100644
--- a/arch/xtensa/kernel/align.S
+++ b/arch/xtensa/kernel/align.S
@@ -442,7 +442,7 @@ ENTRY(fast_unaligned)
         mov     a1, a2
 
         rsr     a0, ps
-        bbsi.l  a2, PS_UM_BIT, 1f     # jump if user mode
+        bbsi.l  a2, PS_UM_BIT, 1f     # jump if user mode
 
         movi    a0, _kernel_exception
         jx      a0
@@ -453,4 +453,3 @@ ENTRY(fast_unaligned)
 ENDPROC(fast_unaligned)
 
 #endif /* XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION */
-
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index 845475afc68..0701fad170d 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -92,7 +92,8 @@ int main(void)
 #endif
         DEFINE(THREAD_XTREGS_USER, offsetof (struct thread_info, xtregs_user));
         DEFINE(XTREGS_USER_SIZE, sizeof(xtregs_user_t));
-        DEFINE(THREAD_CURRENT_DS, offsetof (struct task_struct, thread.current_ds));
+        DEFINE(THREAD_CURRENT_DS, offsetof (struct task_struct, \
+               thread.current_ds));
 
         /* struct mm_struct */
         DEFINE(MM_USERS, offsetof(struct mm_struct, mm_users));
@@ -109,4 +110,3 @@ int main(void)
 
         return 0;
 }
-
diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S
index 60bb1358924..64765748486 100644
--- a/arch/xtensa/kernel/coprocessor.S
+++ b/arch/xtensa/kernel/coprocessor.S
@@ -172,7 +172,7 @@ ENTRY(coprocessor_load)
 ENDPROC(coprocessor_load)
 
 /*
- * coprocessor_flush(struct task_info*, index) 
+ * coprocessor_flush(struct task_info*, index)
  *                             a2        a3
  * coprocessor_restore(struct task_info*, index)
  *                              a2         a3
@@ -354,4 +354,3 @@ ENTRY(coprocessor_owner)
 END(coprocessor_owner)
 
 #endif /* XTENSA_HAVE_COPROCESSORS */
-
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 4c2f2706ad5..3777fec85e7 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -874,7 +874,7 @@ ENTRY(fast_alloca)
 
         _bnei   a0, 1, 1f               # no 'movsp a1, ax': jump
 
-        /* Move the save area. This implies the use of the L32E
+        /* Move the save area. This implies the use of the L32E
          * and S32E instructions, because this move must be done with
          * the user's PS.RING privilege levels, not with ring 0
          * (kernel's) privileges currently active with PS.EXCM
@@ -1008,15 +1008,15 @@ ENDPROC(fast_syscall_user)
 
 ENTRY(fast_syscall_unrecoverable)
 
-        /* Restore all states. */
+        /* Restore all states. */
 
-        l32i    a0, a2, PT_AREG0        # restore a0
-        xsr     a2, depc                # restore a2, depc
-        rsr     a3, excsave1
+        l32i    a0, a2, PT_AREG0        # restore a0
+        xsr     a2, depc                # restore a2, depc
+        rsr     a3, excsave1
 
-        wsr     a0, excsave1
-        movi    a0, unrecoverable_exception
-        callx0  a0
+        wsr     a0, excsave1
+        movi    a0, unrecoverable_exception
+        callx0  a0
 
 ENDPROC(fast_syscall_unrecoverable)
 
@@ -1253,9 +1253,9 @@ fast_syscall_spill_registers_fixup:
 
         movi    a3, exc_table
         rsr     a0, exccause
-        addx4   a0, a0, a3                      # find entry in table
-        l32i    a0, a0, EXC_TABLE_FAST_USER     # load handler
-        jx      a0
+        addx4   a0, a0, a3                      # find entry in table
+        l32i    a0, a0, EXC_TABLE_FAST_USER     # load handler
+        jx      a0
 
 fast_syscall_spill_registers_fixup_return:
 
@@ -1457,7 +1457,7 @@ ENTRY(_spill_registers)
         rsr     a0, ps
         _bbci.l a0, PS_UM_BIT, 1f
 
-        /* User space: Setup a dummy frame and kill application.
+        /* User space: Setup a dummy frame and kill application.
          * Note: We assume EXC_TABLE_KSTK contains a valid stack pointer.
          */
 
diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c
index 451dda928c9..b715237bae6 100644
--- a/arch/xtensa/kernel/module.c
+++ b/arch/xtensa/kernel/module.c
@@ -53,7 +53,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                        struct module *mod)
 {
         unsigned int i;
-        Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
+        Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
         Elf32_Sym *sym;
         unsigned char *location;
         uint32_t value;
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c
index 97230e46cbe..44bf21c3769 100644
--- a/arch/xtensa/kernel/platform.c
+++ b/arch/xtensa/kernel/platform.c
@@ -44,4 +44,3 @@ _F(void, calibrate_ccount, (void),
         ccount_per_jiffy = 10 * (1000000UL/HZ);
 });
 #endif
-
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 1accf28da5f..0dd5784416d 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -108,7 +108,7 @@ void coprocessor_flush_all(struct thread_info *ti)
 
 void cpu_idle(void)
 {
-        local_irq_enable();
+        local_irq_enable();
 
         /* endless idle loop with no priority at all */
         while (1) {
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index 33eea4c16f1..61fb2e9e903 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -154,7 +154,7 @@ int ptrace_setxregs(struct task_struct *child, void __user *uregs)
         coprocessor_flush_all(ti);
         coprocessor_release_all(ti);
 
-        ret |= __copy_from_user(&ti->xtregs_cp, &xtregs->cp0, 
+        ret |= __copy_from_user(&ti->xtregs_cp, &xtregs->cp0,
                                 sizeof(xtregs_coprocessor_t));
 #endif
         ret |= __copy_from_user(&regs->xtregs_opt, &xtregs->opt,
@@ -343,4 +343,3 @@ void do_syscall_trace_leave(struct pt_regs *regs)
                         && (current->ptrace & PT_PTRACED))
                 do_syscall_trace();
 }
-
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 64d80e4b0bd..24c1a57abb4 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -284,7 +284,7 @@ void __init init_arch(bp_tag_t *bp_start)
 
         /* Parse boot parameters */
 
-        if (bp_start)
+        if (bp_start)
                 parse_bootparam(bp_start);
 
 #ifdef CONFIG_OF
@@ -460,7 +460,7 @@ void __init setup_arch(char **cmdline_p)
                 initrd_is_mapped = mem_reserve(__pa(initrd_start),
                                                __pa(initrd_end), 0);
                 initrd_below_start_ok = 1;
-        } else {
+        } else {
                 initrd_start = 0;
         }
 #endif
@@ -539,7 +539,7 @@ c_show(struct seq_file *f, void *slot)
                      "core ID\t\t: " XCHAL_CORE_ID "\n"
                      "build ID\t: 0x%x\n"
                      "byte order\t: %s\n"
-                     "cpu MHz\t\t: %lu.%02lu\n"
+                     "cpu MHz\t\t: %lu.%02lu\n"
                      "bogomips\t: %lu.%02lu\n",
                      XCHAL_BUILD_UNIQUE_ID,
                      XCHAL_HAVE_BE ?  "big" : "little",
@@ -681,4 +681,3 @@ const struct seq_operations cpuinfo_op =
 };
 
 #endif /* CONFIG_PROC_FS */
-
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index 63c566f627b..de34d6be91c 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -212,7 +212,7 @@ restore_sigcontext(struct pt_regs *regs, struct rt_sigframe __user *frame)
         if (err)
                 return err;
 
-        /* The signal handler may have used coprocessors in which
+        /* The signal handler may have used coprocessors in which
          * case they are still enabled.  We disable them to force a
          * reloading of the original task's CP state by the lazy
          * context-switching mechanisms of CP exception handling.
@@ -396,7 +396,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
          */
 
         /* Set up registers for signal handler */
-        start_thread(regs, (unsigned long) ka->sa.sa_handler, 
+        start_thread(regs, (unsigned long) ka->sa.sa_handler,
                      (unsigned long) frame);
 
         /* Set up a stack frame for a call4
@@ -424,9 +424,9 @@ give_sigsegv:
         return -EFAULT;
 }
 
-asmlinkage long xtensa_sigaltstack(const stack_t __user *uss, 
+asmlinkage long xtensa_sigaltstack(const stack_t __user *uss,
                                    stack_t __user *uoss,
-                                   long a2, long a3, long a4, long a5,
+                                   long a2, long a3, long a4, long a5,
                                    struct pt_regs *regs)
 {
         return do_sigaltstack(uss, uoss, regs->areg[1]);
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index 5702065f472..54fa8425cee 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -52,4 +52,3 @@ asmlinkage long xtensa_fadvise64_64(int fd, int advice,
 {
         return sys_fadvise64_64(fd, offset, len, advice);
 }
-
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 691a792b01d..01e0111bf78 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -408,7 +408,8 @@ static inline void spill_registers(void)
                 "wsr    a13, sar\n\t"
                 "wsr    a14, ps\n\t"
                 :: "a" (&a0), "a" (&ps)
-                : "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15", "memory");
+                : "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15",
+                  "memory");
 }
 
 void show_trace(struct task_struct *task, unsigned long *sp)
@@ -463,7 +464,7 @@ void show_stack(struct task_struct *task, unsigned long *sp)
 
         if (!sp)
                 sp = stack_pointer(task);
-        stack = sp;
+        stack = sp;
 
         printk("\nStack: ");
 
@@ -534,5 +535,3 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         do_exit(err);
 }
-
-
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S
index 9365ee5064d..68df35f66ce 100644
--- a/arch/xtensa/kernel/vectors.S
+++ b/arch/xtensa/kernel/vectors.S
@@ -485,5 +485,3 @@ ENTRY_ALIGN64(_WindowUnderflow12)
 ENDPROC(_WindowUnderflow12)
 
         .text
-
-