lkml.org 
[lkml]   [2021]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 1/4] riscv: cmpxchg.h: Cleanup unused code
    Date
    From: Guo Ren <guoren@linux.alibaba.com>

    Remove unnecessary marco, they are no use or handled by generic
    files (atomic-fallback.h, asm-generic/cmpxchg*).

    Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
    Link: https://lore.kernel.org/linux-riscv/CAJF2gTT1_mP-wiK2HsCpTeU61NqZVKZX1A5ye=TwqvGN4TPmrA@mail.gmail.com/
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Michael Clark <michaeljclark@mac.com>
    Cc: Anup Patel <anup@brainfault.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Palmer Dabbelt <palmerdabbelt@google.com>
    ---
    arch/riscv/include/asm/cmpxchg.h | 83 --------------------------------
    1 file changed, 83 deletions(-)

    diff --git a/arch/riscv/include/asm/cmpxchg.h b/arch/riscv/include/asm/cmpxchg.h
    index 262e5bbb2776..f1383c15e16b 100644
    --- a/arch/riscv/include/asm/cmpxchg.h
    +++ b/arch/riscv/include/asm/cmpxchg.h
    @@ -72,13 +72,6 @@
    __ret; \
    })

    -#define xchg_acquire(ptr, x) \
    -({ \
    - __typeof__(*(ptr)) _x_ = (x); \
    - (__typeof__(*(ptr))) __xchg_acquire((ptr), \
    - _x_, sizeof(*(ptr))); \
    -})
    -
    #define __xchg_release(ptr, new, size) \
    ({ \
    __typeof__(ptr) __ptr = (ptr); \
    @@ -107,13 +100,6 @@
    __ret; \
    })

    -#define xchg_release(ptr, x) \
    -({ \
    - __typeof__(*(ptr)) _x_ = (x); \
    - (__typeof__(*(ptr))) __xchg_release((ptr), \
    - _x_, sizeof(*(ptr))); \
    -})
    -
    #define __xchg(ptr, new, size) \
    ({ \
    __typeof__(ptr) __ptr = (ptr); \
    @@ -140,24 +126,6 @@
    __ret; \
    })

    -#define xchg(ptr, x) \
    -({ \
    - __typeof__(*(ptr)) _x_ = (x); \
    - (__typeof__(*(ptr))) __xchg((ptr), _x_, sizeof(*(ptr))); \
    -})
    -
    -#define xchg32(ptr, x) \
    -({ \
    - BUILD_BUG_ON(sizeof(*(ptr)) != 4); \
    - xchg((ptr), (x)); \
    -})
    -
    -#define xchg64(ptr, x) \
    -({ \
    - BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
    - xchg((ptr), (x)); \
    -})
    -
    /*
    * Atomic compare and exchange. Compare OLD with MEM, if identical,
    * store NEW in MEM. Return the initial value in MEM. Success is
    @@ -245,14 +213,6 @@
    __ret; \
    })

    -#define cmpxchg_acquire(ptr, o, n) \
    -({ \
    - __typeof__(*(ptr)) _o_ = (o); \
    - __typeof__(*(ptr)) _n_ = (n); \
    - (__typeof__(*(ptr))) __cmpxchg_acquire((ptr), \
    - _o_, _n_, sizeof(*(ptr))); \
    -})
    -
    #define __cmpxchg_release(ptr, old, new, size) \
    ({ \
    __typeof__(ptr) __ptr = (ptr); \
    @@ -291,14 +251,6 @@
    __ret; \
    })

    -#define cmpxchg_release(ptr, o, n) \
    -({ \
    - __typeof__(*(ptr)) _o_ = (o); \
    - __typeof__(*(ptr)) _n_ = (n); \
    - (__typeof__(*(ptr))) __cmpxchg_release((ptr), \
    - _o_, _n_, sizeof(*(ptr))); \
    -})
    -
    #define __cmpxchg(ptr, old, new, size) \
    ({ \
    __typeof__(ptr) __ptr = (ptr); \
    @@ -337,39 +289,4 @@
    __ret; \
    })

    -#define cmpxchg(ptr, o, n) \
    -({ \
    - __typeof__(*(ptr)) _o_ = (o); \
    - __typeof__(*(ptr)) _n_ = (n); \
    - (__typeof__(*(ptr))) __cmpxchg((ptr), \
    - _o_, _n_, sizeof(*(ptr))); \
    -})
    -
    -#define cmpxchg_local(ptr, o, n) \
    - (__cmpxchg_relaxed((ptr), (o), (n), sizeof(*(ptr))))
    -
    -#define cmpxchg32(ptr, o, n) \
    -({ \
    - BUILD_BUG_ON(sizeof(*(ptr)) != 4); \
    - cmpxchg((ptr), (o), (n)); \
    -})
    -
    -#define cmpxchg32_local(ptr, o, n) \
    -({ \
    - BUILD_BUG_ON(sizeof(*(ptr)) != 4); \
    - cmpxchg_relaxed((ptr), (o), (n)) \
    -})
    -
    -#define cmpxchg64(ptr, o, n) \
    -({ \
    - BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
    - cmpxchg((ptr), (o), (n)); \
    -})
    -
    -#define cmpxchg64_local(ptr, o, n) \
    -({ \
    - BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
    - cmpxchg_relaxed((ptr), (o), (n)); \
    -})
    -
    #endif /* _ASM_RISCV_CMPXCHG_H */
    --
    2.17.1
    \
     
     \ /
      Last update: 2021-03-27 19:08    [W:2.496 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site