locking/atomic/x86: Define arch_atomic_sub() family using arch_atomic_add() functions

ubizjak · ingomolnar · commit 21689e4bfb9a · 2024-04-10T15:04:55.000+02:00
There is no need to implement arch_atomic_sub() family of inline functions, corresponding macros can be directly implemented using arch_atomic_add() inlines with negated argument. No functional changes intended. 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/20240410062957.322614-4-ubizjak@gmail.com
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
@@ -86,23 +86,15 @@ static __always_inline int arch_atomic_add_return(int i, atomic_t *v)
 }
 #define arch_atomic_add_return arch_atomic_add_return
 
-static __always_inline int arch_atomic_sub_return(int i, atomic_t *v)
-{
-	return arch_atomic_add_return(-i, v);
-}
-#define arch_atomic_sub_return arch_atomic_sub_return
+#define arch_atomic_sub_return(i, v) arch_atomic_add_return(-(i), v)
 
 static __always_inline int arch_atomic_fetch_add(int i, atomic_t *v)
 {
 	return xadd(&v->counter, i);
 }
 #define arch_atomic_fetch_add arch_atomic_fetch_add
 
-static __always_inline int arch_atomic_fetch_sub(int i, atomic_t *v)
-{
-	return xadd(&v->counter, -i);
-}
-#define arch_atomic_fetch_sub arch_atomic_fetch_sub
+#define arch_atomic_fetch_sub(i, v) arch_atomic_fetch_add(-(i), v)
 
 static __always_inline int arch_atomic_cmpxchg(atomic_t *v, int old, int new)
 {
diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
@@ -80,23 +80,15 @@ static __always_inline s64 arch_atomic64_add_return(s64 i, atomic64_t *v)
 }
 #define arch_atomic64_add_return arch_atomic64_add_return
 
-static __always_inline s64 arch_atomic64_sub_return(s64 i, atomic64_t *v)
-{
-	return arch_atomic64_add_return(-i, v);
-}
-#define arch_atomic64_sub_return arch_atomic64_sub_return
+#define arch_atomic64_sub_return(i, v) arch_atomic64_add_return(-(i), v)
 
 static __always_inline s64 arch_atomic64_fetch_add(s64 i, atomic64_t *v)
 {
 	return xadd(&v->counter, i);
 }
 #define arch_atomic64_fetch_add arch_atomic64_fetch_add
 
-static __always_inline s64 arch_atomic64_fetch_sub(s64 i, atomic64_t *v)
-{
-	return xadd(&v->counter, -i);
-}
-#define arch_atomic64_fetch_sub arch_atomic64_fetch_sub
+#define arch_atomic64_fetch_sub(i, v) arch_atomic64_fetch_add(-(i), v)
 
 static __always_inline s64 arch_atomic64_cmpxchg(atomic64_t *v, s64 old, s64 new)
 {

Original file line number	Diff line number	Diff line change
`@@ -86,23 +86,15 @@ static __always_inline int arch_atomic_add_return(int i, atomic_t *v)`
`86`	`86`	`}`
`87`	`87`	`#define arch_atomic_add_return arch_atomic_add_return`
`88`	`88`
`89`		`-static __always_inline int arch_atomic_sub_return(int i, atomic_t *v)`
`90`		`-{`
`91`		`- return arch_atomic_add_return(-i, v);`
`92`		`-}`
`93`		`-#define arch_atomic_sub_return arch_atomic_sub_return`
	`89`	`+#define arch_atomic_sub_return(i, v) arch_atomic_add_return(-(i), v)`
`94`	`90`
`95`	`91`	`static __always_inline int arch_atomic_fetch_add(int i, atomic_t *v)`
`96`	`92`	`{`
`97`	`93`	`return xadd(&v->counter, i);`
`98`	`94`	`}`
`99`	`95`	`#define arch_atomic_fetch_add arch_atomic_fetch_add`
`100`	`96`
`101`		`-static __always_inline int arch_atomic_fetch_sub(int i, atomic_t *v)`
`102`		`-{`
`103`		`- return xadd(&v->counter, -i);`
`104`		`-}`
`105`		`-#define arch_atomic_fetch_sub arch_atomic_fetch_sub`
	`97`	`+#define arch_atomic_fetch_sub(i, v) arch_atomic_fetch_add(-(i), v)`
`106`	`98`
`107`	`99`	`static __always_inline int arch_atomic_cmpxchg(atomic_t *v, int old, int new)`
`108`	`100`	`{`
Original file line number	Diff line number	Diff line change
`@@ -80,23 +80,15 @@ static __always_inline s64 arch_atomic64_add_return(s64 i, atomic64_t *v)`
`80`	`80`	`}`
`81`	`81`	`#define arch_atomic64_add_return arch_atomic64_add_return`
`82`	`82`
`83`		`-static __always_inline s64 arch_atomic64_sub_return(s64 i, atomic64_t *v)`
`84`		`-{`
`85`		`- return arch_atomic64_add_return(-i, v);`
`86`		`-}`
`87`		`-#define arch_atomic64_sub_return arch_atomic64_sub_return`
	`83`	`+#define arch_atomic64_sub_return(i, v) arch_atomic64_add_return(-(i), v)`
`88`	`84`
`89`	`85`	`static __always_inline s64 arch_atomic64_fetch_add(s64 i, atomic64_t *v)`
`90`	`86`	`{`
`91`	`87`	`return xadd(&v->counter, i);`
`92`	`88`	`}`
`93`	`89`	`#define arch_atomic64_fetch_add arch_atomic64_fetch_add`
`94`	`90`
`95`		`-static __always_inline s64 arch_atomic64_fetch_sub(s64 i, atomic64_t *v)`
`96`		`-{`
`97`		`- return xadd(&v->counter, -i);`
`98`		`-}`
`99`		`-#define arch_atomic64_fetch_sub arch_atomic64_fetch_sub`
	`91`	`+#define arch_atomic64_fetch_sub(i, v) arch_atomic64_fetch_add(-(i), v)`
`100`	`92`
`101`	`93`	`static __always_inline s64 arch_atomic64_cmpxchg(atomic64_t *v, s64 old, s64 new)`
`102`	`94`	`{`