locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_...

[mirror_ubuntu-focal-kernel.git] / arch / s390 / lib / spinlock.c

diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index b12663d653d82879fb38db734b82b4dc3ec7cf2e..34e30b9ea234e4ad8fbdc5ff9a393934391538db 100644 (file)
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -162,8 +162,8 @@ void _raw_read_lock_wait(arch_rwlock_t *rw)
                                smp_yield_cpu(~owner);
                        count = spin_retry;
                }
-               old = ACCESS_ONCE(rw->lock);
-               owner = ACCESS_ONCE(rw->owner);
+               old = READ_ONCE(rw->lock);
+               owner = READ_ONCE(rw->owner);
                if (old < 0)
                        continue;
                if (__atomic_cmpxchg_bool(&rw->lock, old, old + 1))
@@ -178,7 +178,7 @@ int _raw_read_trylock_retry(arch_rwlock_t *rw)
        int old;
 
        while (count-- > 0) {
-               old = ACCESS_ONCE(rw->lock);
+               old = READ_ONCE(rw->lock);
                if (old < 0)
                        continue;
                if (__atomic_cmpxchg_bool(&rw->lock, old, old + 1))
@@ -202,8 +202,8 @@ void _raw_write_lock_wait(arch_rwlock_t *rw, int prev)
                                smp_yield_cpu(~owner);
                        count = spin_retry;
                }
-               old = ACCESS_ONCE(rw->lock);
-               owner = ACCESS_ONCE(rw->owner);
+               old = READ_ONCE(rw->lock);
+               owner = READ_ONCE(rw->owner);
                smp_mb();
                if (old >= 0) {
                        prev = __RAW_LOCK(&rw->lock, 0x80000000, __RAW_OP_OR);
@@ -230,8 +230,8 @@ void _raw_write_lock_wait(arch_rwlock_t *rw)
                                smp_yield_cpu(~owner);
                        count = spin_retry;
                }
-               old = ACCESS_ONCE(rw->lock);
-               owner = ACCESS_ONCE(rw->owner);
+               old = READ_ONCE(rw->lock);
+               owner = READ_ONCE(rw->owner);
                if (old >= 0 &&
                    __atomic_cmpxchg_bool(&rw->lock, old, old | 0x80000000))
                        prev = old;
@@ -251,7 +251,7 @@ int _raw_write_trylock_retry(arch_rwlock_t *rw)
        int old;
 
        while (count-- > 0) {
-               old = ACCESS_ONCE(rw->lock);
+               old = READ_ONCE(rw->lock);
                if (old)
                        continue;
                if (__atomic_cmpxchg_bool(&rw->lock, 0, 0x80000000))