Skip to content

Commit 75c0bc0

Browse files
rddunlapgregkh
authored andcommitted
bitops: use common function parameter names
[ Upstream commit 8a51b2e ] 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: 84c6591 ("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 407aeb8 commit 75c0bc0

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

  • include/asm-generic/bitops

include/asm-generic/bitops/lock.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
* It can be used to implement bit locks.
1717
*/
1818
static __always_inline int
19-
arch_test_and_set_bit_lock(unsigned int nr, volatile unsigned long *p)
19+
arch_test_and_set_bit_lock(unsigned int nr, volatile unsigned long *addr)
2020
{
2121
long old;
2222
unsigned long mask = BIT_MASK(nr);
2323

24-
p += BIT_WORD(nr);
25-
if (READ_ONCE(*p) & mask)
24+
addr += BIT_WORD(nr);
25+
if (READ_ONCE(*addr) & mask)
2626
return 1;
2727

28-
old = raw_atomic_long_fetch_or_acquire(mask, (atomic_long_t *)p);
28+
old = raw_atomic_long_fetch_or_acquire(mask, (atomic_long_t *)addr);
2929
return !!(old & mask);
3030
}
3131

@@ -38,10 +38,10 @@ arch_test_and_set_bit_lock(unsigned int nr, volatile unsigned long *p)
3838
* This operation is atomic and provides release barrier semantics.
3939
*/
4040
static __always_inline void
41-
arch_clear_bit_unlock(unsigned int nr, volatile unsigned long *p)
41+
arch_clear_bit_unlock(unsigned int nr, volatile unsigned long *addr)
4242
{
43-
p += BIT_WORD(nr);
44-
raw_atomic_long_fetch_andnot_release(BIT_MASK(nr), (atomic_long_t *)p);
43+
addr += BIT_WORD(nr);
44+
raw_atomic_long_fetch_andnot_release(BIT_MASK(nr), (atomic_long_t *)addr);
4545
}
4646

4747
/**
@@ -56,14 +56,14 @@ arch_clear_bit_unlock(unsigned int nr, volatile unsigned long *p)
5656
* See for example x86's implementation.
5757
*/
5858
static inline void
59-
arch___clear_bit_unlock(unsigned int nr, volatile unsigned long *p)
59+
arch___clear_bit_unlock(unsigned int nr, volatile unsigned long *addr)
6060
{
6161
unsigned long old;
6262

63-
p += BIT_WORD(nr);
64-
old = READ_ONCE(*p);
63+
addr += BIT_WORD(nr);
64+
old = READ_ONCE(*addr);
6565
old &= ~BIT_MASK(nr);
66-
raw_atomic_long_set_release((atomic_long_t *)p, old);
66+
raw_atomic_long_set_release((atomic_long_t *)addr, old);
6767
}
6868

6969
#ifndef arch_xor_unlock_is_negative_byte

0 commit comments

Comments
 (0)