Skip to content

Commit 08d95a1

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/atomic_ops: Let __atomic_add_const() variants always return void
Depending on MARCH_HAS_Z196_FEATURES __atomic_add_const() returns void or the previous value before the atomic variant. Make sure that for both cases void is returned so potential incorrect usage results in both cases in a compile error. Reviewed-by: Juergen Christ <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent f740a8b commit 08d95a1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/s390/include/asm/atomic_ops.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ __ATOMIC64_OPS(__atomic64_xor, "xgr")
163163

164164
#undef __ATOMIC64_OPS
165165

166-
#define __atomic_add_const(val, ptr) __atomic_add(val, ptr)
167-
#define __atomic_add_const_barrier(val, ptr) __atomic_add(val, ptr)
168-
#define __atomic64_add_const(val, ptr) __atomic64_add(val, ptr)
169-
#define __atomic64_add_const_barrier(val, ptr) __atomic64_add(val, ptr)
166+
#define __atomic_add_const(val, ptr) ((void)__atomic_add(val, ptr))
167+
#define __atomic_add_const_barrier(val, ptr) ((void)__atomic_add(val, ptr))
168+
#define __atomic64_add_const(val, ptr) ((void)__atomic64_add(val, ptr))
169+
#define __atomic64_add_const_barrier(val, ptr) ((void)__atomic64_add(val, ptr))
170170

171171
#endif /* MARCH_HAS_Z196_FEATURES */
172172

0 commit comments

Comments
 (0)