s390/spinlock: Use symbolic names in inline assemblies

Improve readability and use symbolic names.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index ac868a9bb0d180fe5bc469106c043b5714f97083..f2722775baf6a78498ef01cb444c516b3e41ee96 100644 (file)
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -82,9 +82,10 @@ static inline void arch_spin_unlock(arch_spinlock_t *lp)
        kcsan_release();
        asm_inline volatile(
                ALTERNATIVE("nop", ".insn rre,0xb2fa0000,7,0", ALT_FACILITY(49)) /* NIAI 7 */
-               "       sth     %1,%0\n"
-               : "=R" (((unsigned short *) &lp->lock)[1])
-               : "d" (0) : "cc", "memory");
+               "       sth     %[zero],%[lock]\n"
+               : [lock] "=R" (((unsigned short *)&lp->lock)[1])
+               : [zero] "d" (0)
+               : "cc", "memory");
 }
 
 /*

diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index 09d735010ee1b8d17884ae9b8af627f3b9f37f55..255c0a8202e7cda4421bd058873439feb82f6839 100644 (file)
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -76,8 +76,8 @@ static inline int arch_load_niai4(int *lock)
 
        asm_inline volatile(
                ALTERNATIVE("nop", ".insn rre,0xb2fa0000,4,0", ALT_FACILITY(49)) /* NIAI 4 */
-               "       l       %0,%1\n"
-               : "=d" (owner) : "Q" (*lock) : "memory");
+               "       l       %[owner],%[lock]\n"
+               : [owner] "=d" (owner) : [lock] "Q" (*lock) : "memory");
        return owner;
 }
 
@@ -87,9 +87,9 @@ static inline int arch_cmpxchg_niai8(int *lock, int old, int new)
 
        asm_inline volatile(
                ALTERNATIVE("nop", ".insn rre,0xb2fa0000,8,0", ALT_FACILITY(49)) /* NIAI 8 */
-               "       cs      %0,%3,%1\n"
-               : "=d" (old), "=Q" (*lock)
-               : "0" (old), "d" (new), "Q" (*lock)
+               "       cs      %[old],%[new],%[lock]\n"
+               : [old] "+d" (old), [lock] "+Q" (*lock)
+               : [new] "d" (new)
                : "cc", "memory");
        return expected == old;
 }