MIPS: Whitespace cleanup.

[linux-drm-fsl-dcu.git] / arch / mips / include / asm / octeon / cvmx-spinlock.h

diff --git a/arch/mips/include/asm/octeon/cvmx-spinlock.h b/arch/mips/include/asm/octeon/cvmx-spinlock.h
index a672abb1bc4f2a196c63909452ef188472e7e97c..4f09cff8b8c021d03f13f7bd0353a76e570ac3f9 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-spinlock.h
+++ b/arch/mips/include/asm/octeon/cvmx-spinlock.h
@@ -26,7 +26,7 @@
  ***********************license end**************************************/
 
 /**
- * Implementation of spinlocks for Octeon CVMX.  Although similar in
+ * Implementation of spinlocks for Octeon CVMX.         Although similar in
  * function to Linux kernel spinlocks, they are not compatible.
  * Octeon CVMX spinlocks are only used to synchronize with the boot
  * monitor and other non-Linux programs running in the system.
@@ -50,8 +50,8 @@ typedef struct {
 } cvmx_spinlock_t;
 
 /* note - macros not expanded in inline ASM, so values hardcoded */
-#define  CVMX_SPINLOCK_UNLOCKED_VAL  0
-#define  CVMX_SPINLOCK_LOCKED_VAL    1
+#define         CVMX_SPINLOCK_UNLOCKED_VAL  0
+#define         CVMX_SPINLOCK_LOCKED_VAL    1
 
 #define CVMX_SPINLOCK_UNLOCKED_INITIALIZER  {CVMX_SPINLOCK_UNLOCKED_VAL}
 
@@ -96,7 +96,7 @@ static inline void cvmx_spinlock_unlock(cvmx_spinlock_t *lock)
  * @lock:   pointer to lock structure
  *
  * Returns 0: lock successfully taken
- *         1: lock not taken, held by someone else
+ *        1: lock not taken, held by someone else
  * These return values match the Linux semantics.
  */
 
@@ -104,16 +104,16 @@ static inline unsigned int cvmx_spinlock_trylock(cvmx_spinlock_t *lock)
 {
        unsigned int tmp;
 
-       __asm__ __volatile__(".set noreorder         \n"
+       __asm__ __volatile__(".set noreorder         \n"
                             "1: ll   %[tmp], %[val] \n"
                        /* if lock held, fail immediately */
-                            "   bnez %[tmp], 2f     \n"
-                            "   li   %[tmp], 1      \n"
-                            "   sc   %[tmp], %[val] \n"
-                            "   beqz %[tmp], 1b     \n"
-                            "   li   %[tmp], 0      \n"
-                            "2:                     \n"
-                            ".set reorder           \n" :
+                            "   bnez %[tmp], 2f     \n"
+                            "   li   %[tmp], 1      \n"
+                            "   sc   %[tmp], %[val] \n"
+                            "   beqz %[tmp], 1b     \n"
+                            "   li   %[tmp], 0      \n"
+                            "2:                     \n"
+                            ".set reorder           \n" :
                        [val] "+m"(lock->value), [tmp] "=&r"(tmp)
                             : : "memory");
 
@@ -129,14 +129,14 @@ static inline void cvmx_spinlock_lock(cvmx_spinlock_t *lock)
 {
        unsigned int tmp;
 
-       __asm__ __volatile__(".set noreorder         \n"
+       __asm__ __volatile__(".set noreorder         \n"
                             "1: ll   %[tmp], %[val]  \n"
-                            "   bnez %[tmp], 1b     \n"
-                            "   li   %[tmp], 1      \n"
-                            "   sc   %[tmp], %[val] \n"
-                            "   beqz %[tmp], 1b     \n"
-                            "   nop                \n"
-                            ".set reorder           \n" :
+                            "   bnez %[tmp], 1b     \n"
+                            "   li   %[tmp], 1      \n"
+                            "   sc   %[tmp], %[val] \n"
+                            "   beqz %[tmp], 1b     \n"
+                            "   nop                \n"
+                            ".set reorder           \n" :
                        [val] "+m"(lock->value), [tmp] "=&r"(tmp)
                        : : "memory");
 
@@ -163,17 +163,17 @@ static inline void cvmx_spinlock_bit_lock(uint32_t *word)
        unsigned int tmp;
        unsigned int sav;
 
-       __asm__ __volatile__(".set noreorder         \n"
-                            ".set noat              \n"
+       __asm__ __volatile__(".set noreorder         \n"
+                            ".set noat              \n"
                             "1: ll    %[tmp], %[val]  \n"
-                            "   bbit1 %[tmp], 31, 1b    \n"
-                            "   li    $at, 1      \n"
-                            "   ins   %[tmp], $at, 31, 1  \n"
-                            "   sc    %[tmp], %[val] \n"
-                            "   beqz  %[tmp], 1b     \n"
-                            "   nop                \n"
-                            ".set at              \n"
-                            ".set reorder           \n" :
+                            "   bbit1 %[tmp], 31, 1b    \n"
+                            "   li    $at, 1      \n"
+                            "   ins   %[tmp], $at, 31, 1  \n"
+                            "   sc    %[tmp], %[val] \n"
+                            "   beqz  %[tmp], 1b     \n"
+                            "   nop                \n"
+                            ".set at              \n"
+                            ".set reorder           \n" :
                        [val] "+m"(*word), [tmp] "=&r"(tmp), [sav] "=&r"(sav)
                             : : "memory");
 
@@ -187,7 +187,7 @@ static inline void cvmx_spinlock_bit_lock(uint32_t *word)
  *
  * @word:  word to lock bit 31 of
  * Returns 0: lock successfully taken
- *         1: lock not taken, held by someone else
+ *        1: lock not taken, held by someone else
  * These return values match the Linux semantics.
  */
 static inline unsigned int cvmx_spinlock_bit_trylock(uint32_t *word)
@@ -198,15 +198,15 @@ static inline unsigned int cvmx_spinlock_bit_trylock(uint32_t *word)
                             ".set noat\n"
                             "1: ll    %[tmp], %[val] \n"
                        /* if lock held, fail immediately */
-                            "   bbit1 %[tmp], 31, 2f     \n"
-                            "   li    $at, 1      \n"
-                            "   ins   %[tmp], $at, 31, 1  \n"
-                            "   sc    %[tmp], %[val] \n"
-                            "   beqz  %[tmp], 1b     \n"
-                            "   li    %[tmp], 0      \n"
-                            "2:                     \n"
-                            ".set at              \n"
-                            ".set reorder           \n" :
+                            "   bbit1 %[tmp], 31, 2f     \n"
+                            "   li    $at, 1      \n"
+                            "   ins   %[tmp], $at, 31, 1  \n"
+                            "   sc    %[tmp], %[val] \n"
+                            "   beqz  %[tmp], 1b     \n"
+                            "   li    %[tmp], 0      \n"
+                            "2:                     \n"
+                            ".set at              \n"
+                            ".set reorder           \n" :
                        [val] "+m"(*word), [tmp] "=&r"(tmp)
                        : : "memory");