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>

6 files changed, 13 insertions, 18 deletions

diff --git a/arch/xtensa/lib/checksum.S b/arch/xtensa/lib/checksum.S
index 0470ca21a359..4eb573d2720e 100644
--- a/arch/xtensa/lib/checksum.S
+++ b/arch/xtensa/lib/checksum.S
@@ -41,10 +41,11 @@
 
 .text
 ENTRY(csum_partial)
-          /*
-           * Experiments with Ethernet and SLIP connections show that buf
-           * is aligned on either a 2-byte or 4-byte boundary.
-           */
+
+        /*
+         * Experiments with Ethernet and SLIP connections show that buf
+         * is aligned on either a 2-byte or 4-byte boundary.
+         */
         entry   sp, 32
         extui   a5, a2, 0, 2
         bnez    a5, 8f          /* branch if 2-byte aligned */
@@ -409,4 +410,3 @@ ENDPROC(csum_partial_copy_generic)
         retw
 
 .previous
-
diff --git a/arch/xtensa/lib/memcopy.S b/arch/xtensa/lib/memcopy.S
index c48b80acb5f0..b1c219acabe7 100644
--- a/arch/xtensa/lib/memcopy.S
+++ b/arch/xtensa/lib/memcopy.S
@@ -210,8 +210,10 @@ memcpy:
         _beqz   a4, .Ldone      # avoid loading anything for zero-length copies
         # copy 16 bytes per iteration for word-aligned dst and unaligned src
         ssa8    a3              # set shift amount from byte offset
-#define SIM_CHECKS_ALIGNMENT    1       /* set to 1 when running on ISS (simulator) with the
-                                           lint or ferret client, or 0 to save a few cycles */
+
+/* set to 1 when running on ISS (simulator) with the
+   lint or ferret client, or 0 to save a few cycles */
+#define SIM_CHECKS_ALIGNMENT    1
 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || SIM_CHECKS_ALIGNMENT
         and     a11, a3, a8     # save unalignment offset for below
         sub     a3, a3, a11     # align a3
diff --git a/arch/xtensa/lib/pci-auto.c b/arch/xtensa/lib/pci-auto.c
index a71733ae1193..34d05abbd921 100644
--- a/arch/xtensa/lib/pci-auto.c
+++ b/arch/xtensa/lib/pci-auto.c
@@ -241,8 +241,8 @@ int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
         unsigned char header_type;
         struct pci_dev *dev = &pciauto_dev;
 
-        pciauto_dev.bus = &pciauto_bus;
-        pciauto_dev.sysdata = pci_ctrl;
+        pciauto_dev.bus = &pciauto_bus;
+        pciauto_dev.sysdata = pci_ctrl;
         pciauto_bus.ops = pci_ctrl->ops;
 
         /*
@@ -345,8 +345,3 @@ int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
         }
         return sub_bus;
 }
-
-
-
-
-
diff --git a/arch/xtensa/lib/strncpy_user.S b/arch/xtensa/lib/strncpy_user.S
index 9f603cdaaa68..1ad0ecf45368 100644
--- a/arch/xtensa/lib/strncpy_user.S
+++ b/arch/xtensa/lib/strncpy_user.S
@@ -166,7 +166,7 @@ __strncpy_user:
         retw
 .Lz1:   # byte 1 is zero
 #ifdef __XTENSA_EB__
-        extui   a9, a9, 16, 16
+        extui   a9, a9, 16, 16
 #endif /* __XTENSA_EB__ */
         EX(s16i, a9, a11, 0, fixup_s)
         addi    a11, a11, 1             # advance dst pointer
@@ -174,7 +174,7 @@ __strncpy_user:
         retw
 .Lz2:   # byte 2 is zero
 #ifdef __XTENSA_EB__
-        extui   a9, a9, 16, 16
+        extui   a9, a9, 16, 16
 #endif /* __XTENSA_EB__ */
         EX(s16i, a9, a11, 0, fixup_s)
         movi    a9, 0
diff --git a/arch/xtensa/lib/strnlen_user.S b/arch/xtensa/lib/strnlen_user.S
index 23f2a89816a1..4c03b1e581e9 100644
--- a/arch/xtensa/lib/strnlen_user.S
+++ b/arch/xtensa/lib/strnlen_user.S
@@ -145,4 +145,3 @@ __strnlen_user:
 lenfixup:
         movi    a2, 0
         retw
-
diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S
index 46d60314bb16..ace1892a875e 100644
--- a/arch/xtensa/lib/usercopy.S
+++ b/arch/xtensa/lib/usercopy.S
@@ -318,4 +318,3 @@ l_fixup:
         /* Ignore memset return value in a6. */
         /* a2 still contains bytes not copied. */
         retw
-