locking/atomic/x86: Redeclare x86_32 arch_atomic64_{add,sub}() as void

ubizjak · Ingo Molnar · commit dce2a224763c · 2024-07-17T16:28:19.000+02:00
Correct the return type of x86_32 arch_atomic64_add() and arch_atomic64_sub() functions to 'void' and remove redundant return. Signed-off-by: Uros Bizjak <ubizjak@gmail.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/20240605181424.3228-2-ubizjak@gmail.com
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
@@ -163,20 +163,18 @@ static __always_inline s64 arch_atomic64_dec_return(atomic64_t *v)
 }
 #define arch_atomic64_dec_return arch_atomic64_dec_return
 
-static __always_inline s64 arch_atomic64_add(s64 i, atomic64_t *v)
+static __always_inline void arch_atomic64_add(s64 i, atomic64_t *v)
 {
 	__alternative_atomic64(add, add_return,
 			       ASM_OUTPUT2("+A" (i), "+c" (v)),
 			       ASM_NO_INPUT_CLOBBER("memory"));
-	return i;
 }
 
-static __always_inline s64 arch_atomic64_sub(s64 i, atomic64_t *v)
+static __always_inline void arch_atomic64_sub(s64 i, atomic64_t *v)
 {
 	__alternative_atomic64(sub, sub_return,
 			       ASM_OUTPUT2("+A" (i), "+c" (v)),
 			       ASM_NO_INPUT_CLOBBER("memory"));
-	return i;
 }
 
 static __always_inline void arch_atomic64_inc(atomic64_t *v)

Original file line number	Diff line number	Diff line change
`@@ -163,20 +163,18 @@ static __always_inline s64 arch_atomic64_dec_return(atomic64_t *v)`
`163`	`163`	`}`
`164`	`164`	`#define arch_atomic64_dec_return arch_atomic64_dec_return`
`165`	`165`
`166`		`-static __always_inline s64 arch_atomic64_add(s64 i, atomic64_t *v)`
	`166`	`+static __always_inline void arch_atomic64_add(s64 i, atomic64_t *v)`
`167`	`167`	`{`
`168`	`168`	`__alternative_atomic64(add, add_return,`
`169`	`169`	`ASM_OUTPUT2("+A" (i), "+c" (v)),`
`170`	`170`	`ASM_NO_INPUT_CLOBBER("memory"));`
`171`		`- return i;`
`172`	`171`	`}`
`173`	`172`
`174`		`-static __always_inline s64 arch_atomic64_sub(s64 i, atomic64_t *v)`
	`173`	`+static __always_inline void arch_atomic64_sub(s64 i, atomic64_t *v)`
`175`	`174`	`{`
`176`	`175`	`__alternative_atomic64(sub, sub_return,`
`177`	`176`	`ASM_OUTPUT2("+A" (i), "+c" (v)),`
`178`	`177`	`ASM_NO_INPUT_CLOBBER("memory"));`
`179`		`- return i;`
`180`	`178`	`}`
`181`	`179`
`182`	`180`	`static __always_inline void arch_atomic64_inc(atomic64_t *v)`