mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-21 22:47:51 -04:00
bitops: use common function parameter names
Fix the function prototypes to use the common parameter name 'addr'
instead of 'p' (common to arch-specific implementations of these
functions).
This avoids the kernel-doc warnings:
Warning: include/asm-generic/bitops/lock.h:19 function parameter 'p'
not described in 'arch_test_and_set_bit_lock'
Warning: include/asm-generic/bitops/lock.h:41 function parameter 'p'
not described in 'arch_clear_bit_unlock'
Warning: include/asm-generic/bitops/lock.h:59 function parameter 'p'
not described in 'arch___clear_bit_unlock'
Fixes: 84c6591103 ("locking/atomics, asm-generic/bitops/lock.h: Rewrite using atomic_fetch_*()")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Yury Norov <yury.norov@gmail.com>
This commit is contained in:
@@ -16,16 +16,16 @@
|
||||
* It can be used to implement bit locks.
|
||||
*/
|
||||
static __always_inline int
|
||||
arch_test_and_set_bit_lock(unsigned int nr, volatile unsigned long *p)
|
||||
arch_test_and_set_bit_lock(unsigned int nr, volatile unsigned long *addr)
|
||||
{
|
||||
long old;
|
||||
unsigned long mask = BIT_MASK(nr);
|
||||
|
||||
p += BIT_WORD(nr);
|
||||
if (READ_ONCE(*p) & mask)
|
||||
addr += BIT_WORD(nr);
|
||||
if (READ_ONCE(*addr) & mask)
|
||||
return 1;
|
||||
|
||||
old = raw_atomic_long_fetch_or_acquire(mask, (atomic_long_t *)p);
|
||||
old = raw_atomic_long_fetch_or_acquire(mask, (atomic_long_t *)addr);
|
||||
return !!(old & mask);
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@ arch_test_and_set_bit_lock(unsigned int nr, volatile unsigned long *p)
|
||||
* This operation is atomic and provides release barrier semantics.
|
||||
*/
|
||||
static __always_inline void
|
||||
arch_clear_bit_unlock(unsigned int nr, volatile unsigned long *p)
|
||||
arch_clear_bit_unlock(unsigned int nr, volatile unsigned long *addr)
|
||||
{
|
||||
p += BIT_WORD(nr);
|
||||
raw_atomic_long_fetch_andnot_release(BIT_MASK(nr), (atomic_long_t *)p);
|
||||
addr += BIT_WORD(nr);
|
||||
raw_atomic_long_fetch_andnot_release(BIT_MASK(nr), (atomic_long_t *)addr);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,14 +56,14 @@ arch_clear_bit_unlock(unsigned int nr, volatile unsigned long *p)
|
||||
* See for example x86's implementation.
|
||||
*/
|
||||
static inline void
|
||||
arch___clear_bit_unlock(unsigned int nr, volatile unsigned long *p)
|
||||
arch___clear_bit_unlock(unsigned int nr, volatile unsigned long *addr)
|
||||
{
|
||||
unsigned long old;
|
||||
|
||||
p += BIT_WORD(nr);
|
||||
old = READ_ONCE(*p);
|
||||
addr += BIT_WORD(nr);
|
||||
old = READ_ONCE(*addr);
|
||||
old &= ~BIT_MASK(nr);
|
||||
raw_atomic_long_set_release((atomic_long_t *)p, old);
|
||||
raw_atomic_long_set_release((atomic_long_t *)addr, old);
|
||||
}
|
||||
|
||||
#ifndef arch_xor_unlock_is_negative_byte
|
||||
|
||||
Reference in New Issue
Block a user