parisc: __cmpxchg_u32(): lift conversion into the callers

Al Viro · paulmckrcu · commit 29b8e53c1274 · 2024-04-09T22:06:00.000-07:00
__cmpxchg_u32() return value is unsigned int explicitly cast to
unsigned long.  Both callers are returns from functions that
return unsigned long; might as well have __cmpxchg_u32()
return that unsigned int (aka u32) and let the callers convert
implicitly.

Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
Signed-off-by: Paul E. McKenney &lt;paulmck@kernel.org&gt;
diff --git a/arch/parisc/include/asm/cmpxchg.h b/arch/parisc/include/asm/cmpxchg.h
@@ -57,8 +57,7 @@ __arch_xchg(unsigned long x, volatile void *ptr, int size)
 extern void __cmpxchg_called_with_bad_pointer(void);
 
 /* __cmpxchg_u32/u64 defined in arch/parisc/lib/bitops.c */
-extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old,
-				   unsigned int new_);
+extern u32 __cmpxchg_u32(volatile u32 *m, u32 old, u32 new_);
 extern u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new_);
 extern u8 __cmpxchg_u8(volatile u8 *ptr, u8 old, u8 new_);
 
diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c
@@ -68,16 +68,16 @@ u64 notrace __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new)
 	return prev;
 }
 
-unsigned long notrace __cmpxchg_u32(volatile unsigned int *ptr, unsigned int old, unsigned int new)
+u32 notrace __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new)
 {
 	unsigned long flags;
-	unsigned int prev;
+	u32 prev;
 
 	_atomic_spin_lock_irqsave(ptr, flags);
 	if ((prev = *ptr) == old)
 		*ptr = new;
 	_atomic_spin_unlock_irqrestore(ptr, flags);
-	return (unsigned long)prev;
+	return prev;
 }
 
 u8 notrace __cmpxchg_u8(volatile u8 *ptr, u8 old, u8 new)

Original file line number	Diff line number	Diff line change
`@@ -68,16 +68,16 @@ u64 notrace __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new)`
`68`	`68`	`return prev;`
`69`	`69`	`}`
`70`	`70`
`71`		`-unsigned long notrace __cmpxchg_u32(volatile unsigned int *ptr, unsigned int old, unsigned int new)`
	`71`	`+u32 notrace __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new)`
`72`	`72`	`{`
`73`	`73`	`unsigned long flags;`
`74`		`- unsigned int prev;`
	`74`	`+ u32 prev;`
`75`	`75`
`76`	`76`	`_atomic_spin_lock_irqsave(ptr, flags);`
`77`	`77`	`if ((prev = *ptr) == old)`
`78`	`78`	`*ptr = new;`
`79`	`79`	`_atomic_spin_unlock_irqrestore(ptr, flags);`
`80`		`- return (unsigned long)prev;`
	`80`	`+ return prev;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`u8 notrace __cmpxchg_u8(volatile u8 *ptr, u8 old, u8 new)`