locking,arch,metag: Fold atomic_ops

Many of the atomic op implementations are the same except for one
instruction; fold the lot into a few CPP macros and reduce LoC.

This also prepares for easy addition of new ops.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: James Hogan <james.hogan@imgtec.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-metag@vger.kernel.org
Link: http://lkml.kernel.org/r/20140508135852.453864110@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/metag/include/asm/atomic_lnkget.h b/arch/metag/include/asm/atomic_lnkget.h
index d2e60a18986c37a3c35263d3a8beff18a2316643..948d8688643c5823ae8cfc71cae920fa5b9ede02 100644 (file)
--- a/arch/metag/include/asm/atomic_lnkget.h
+++ b/arch/metag/include/asm/atomic_lnkget.h
@@ -27,85 +27,56 @@ static inline int atomic_read(const atomic_t *v)
        return temp;
 }
 
-static inline void atomic_add(int i, atomic_t *v)
-{
-       int temp;
-
-       asm volatile (
-               "1:     LNKGETD %0, [%1]\n"
-               "       ADD     %0, %0, %2\n"
-               "       LNKSETD [%1], %0\n"
-               "       DEFR    %0, TXSTAT\n"
-               "       ANDT    %0, %0, #HI(0x3f000000)\n"
-               "       CMPT    %0, #HI(0x02000000)\n"
-               "       BNZ     1b\n"
-               : "=&d" (temp)
-               : "da" (&v->counter), "bd" (i)
-               : "cc");
+#define ATOMIC_OP(op)                                                  \
+static inline void atomic_##op(int i, atomic_t *v)                     \
+{                                                                      \
+       int temp;                                                       \
+                                                                       \
+       asm volatile (                                                  \
+               "1:     LNKGETD %0, [%1]\n"                             \
+               "       " #op " %0, %0, %2\n"                           \
+               "       LNKSETD [%1], %0\n"                             \
+               "       DEFR    %0, TXSTAT\n"                           \
+               "       ANDT    %0, %0, #HI(0x3f000000)\n"              \
+               "       CMPT    %0, #HI(0x02000000)\n"                  \
+               "       BNZ     1b\n"                                   \
+               : "=&d" (temp)                                          \
+               : "da" (&v->counter), "bd" (i)                          \
+               : "cc");                                                \
+}                                                                      \
+
+#define ATOMIC_OP_RETURN(op)                                           \
+static inline int atomic_##op##_return(int i, atomic_t *v)             \
+{                                                                      \
+       int result, temp;                                               \
+                                                                       \
+       smp_mb();                                                       \
+                                                                       \
+       asm volatile (                                                  \
+               "1:     LNKGETD %1, [%2]\n"                             \
+               "       " #op " %1, %1, %3\n"                           \
+               "       LNKSETD [%2], %1\n"                             \
+               "       DEFR    %0, TXSTAT\n"                           \
+               "       ANDT    %0, %0, #HI(0x3f000000)\n"              \
+               "       CMPT    %0, #HI(0x02000000)\n"                  \
+               "       BNZ 1b\n"                                       \
+               : "=&d" (temp), "=&da" (result)                         \
+               : "da" (&v->counter), "bd" (i)                          \
+               : "cc");                                                \
+                                                                       \
+       smp_mb();                                                       \
+                                                                       \
+       return result;                                                  \
 }
 
-static inline void atomic_sub(int i, atomic_t *v)
-{
-       int temp;
+#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
 
-       asm volatile (
-               "1:     LNKGETD %0, [%1]\n"
-               "       SUB     %0, %0, %2\n"
-               "       LNKSETD [%1], %0\n"
-               "       DEFR    %0, TXSTAT\n"
-               "       ANDT    %0, %0, #HI(0x3f000000)\n"
-               "       CMPT    %0, #HI(0x02000000)\n"
-               "       BNZ 1b\n"
-               : "=&d" (temp)
-               : "da" (&v->counter), "bd" (i)
-               : "cc");
-}
+ATOMIC_OPS(add)
+ATOMIC_OPS(sub)
 
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-       int result, temp;
-
-       smp_mb();
-
-       asm volatile (
-               "1:     LNKGETD %1, [%2]\n"
-               "       ADD     %1, %1, %3\n"
-               "       LNKSETD [%2], %1\n"
-               "       DEFR    %0, TXSTAT\n"
-               "       ANDT    %0, %0, #HI(0x3f000000)\n"
-               "       CMPT    %0, #HI(0x02000000)\n"
-               "       BNZ 1b\n"
-               : "=&d" (temp), "=&da" (result)
-               : "da" (&v->counter), "bd" (i)
-               : "cc");
-
-       smp_mb();
-
-       return result;
-}
-
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-       int result, temp;
-
-       smp_mb();
-
-       asm volatile (
-               "1:     LNKGETD %1, [%2]\n"
-               "       SUB     %1, %1, %3\n"
-               "       LNKSETD [%2], %1\n"
-               "       DEFR    %0, TXSTAT\n"
-               "       ANDT    %0, %0, #HI(0x3f000000)\n"
-               "       CMPT    %0, #HI(0x02000000)\n"
-               "       BNZ     1b\n"
-               : "=&d" (temp), "=&da" (result)
-               : "da" (&v->counter), "bd" (i)
-               : "cc");
-
-       smp_mb();
-
-       return result;
-}
+#undef ATOMIC_OPS
+#undef ATOMIC_OP_RETURN
+#undef ATOMIC_OP
 
 static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
 {

diff --git a/arch/metag/include/asm/atomic_lock1.h b/arch/metag/include/asm/atomic_lock1.h
index e578955e674b8a4517b6f3e13fe38b062eff80b6..f5d5898c10201cb32a94044ec53a4e2d5ef3b01a 100644 (file)
--- a/arch/metag/include/asm/atomic_lock1.h
+++ b/arch/metag/include/asm/atomic_lock1.h
@@ -37,55 +37,41 @@ static inline int atomic_set(atomic_t *v, int i)
        return i;
 }
 
-static inline void atomic_add(int i, atomic_t *v)
-{
-       unsigned long flags;
-
-       __global_lock1(flags);
-       fence();
-       v->counter += i;
-       __global_unlock1(flags);
+#define ATOMIC_OP(op, c_op)                                            \
+static inline void atomic_##op(int i, atomic_t *v)                     \
+{                                                                      \
+       unsigned long flags;                                            \
+                                                                       \
+       __global_lock1(flags);                                          \
+       fence();                                                        \
+       v->counter c_op i;                                              \
+       __global_unlock1(flags);                                        \
+}                                                                      \
+
+#define ATOMIC_OP_RETURN(op, c_op)                                     \
+static inline int atomic_##op##_return(int i, atomic_t *v)             \
+{                                                                      \
+       unsigned long result;                                           \
+       unsigned long flags;                                            \
+                                                                       \
+       __global_lock1(flags);                                          \
+       result = v->counter;                                            \
+       result c_op i;                                                  \
+       fence();                                                        \
+       v->counter = result;                                            \
+       __global_unlock1(flags);                                        \
+                                                                       \
+       return result;                                                  \
 }
 
-static inline void atomic_sub(int i, atomic_t *v)
-{
-       unsigned long flags;
+#define ATOMIC_OPS(op, c_op) ATOMIC_OP(op, c_op) ATOMIC_OP_RETURN(op, c_op)
 
-       __global_lock1(flags);
-       fence();
-       v->counter -= i;
-       __global_unlock1(flags);
-}
-
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-       unsigned long result;
-       unsigned long flags;
+ATOMIC_OPS(add, +=)
+ATOMIC_OPS(sub, -=)
 
-       __global_lock1(flags);
-       result = v->counter;
-       result += i;
-       fence();
-       v->counter = result;
-       __global_unlock1(flags);
-
-       return result;
-}
-
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-       unsigned long result;
-       unsigned long flags;
-
-       __global_lock1(flags);
-       result = v->counter;
-       result -= i;
-       fence();
-       v->counter = result;
-       __global_unlock1(flags);
-
-       return result;
-}
+#undef ATOMIC_OPS
+#undef ATOMIC_OP_RETURN
+#undef ATOMIC_OP
 
 static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
 {