[PATCH v2 12/16] bitfield: Remove leading _ from #define formal parameter names

david.laight.linux
2025-12-12T19:38:12Z

From: David Laight <david.laight.linux@gmail.com>

There is no need to 'protect' formal parameter names from anything
outside the #define body itself.

Signed-off-by: David Laight <david.laight.linux@gmail.com>
---
include/linux/bitfield.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/linux/bitfield.h b/include/linux/bitfield.h
index 6f454ef43d24..753032285754 100644
--- a/include/linux/bitfield.h
+++ b/include/linux/bitfield.h
@@ -48,12 +48,12 @@
#define __BF_VALIDATE_MASK(mask) \
(!(mask) || ((mask) & ((mask) + ((mask) & -(mask)))))

-#define __BF_FIELD_CHECK_MASK(_mask, _pfx) \
+#define __BF_FIELD_CHECK_MASK(mask, pfx) \
do { \
- BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask), \
- _pfx "mask is not constant"); \
- BUILD_BUG_ON_MSG(__BF_VALIDATE_MASK(_mask), \
- _pfx "mask is zero or not contiguous"); \
+ BUILD_BUG_ON_MSG(!__builtin_constant_p(mask), \
+ pfx "mask is not constant"); \
+ BUILD_BUG_ON_MSG(__BF_VALIDATE_MASK(mask), \
+ pfx "mask is zero or not contiguous"); \
} while (0)

#define __BF_FIELD_CHECK_VAL(mask, val, pfx) \
@@ -126,8 +126,8 @@

/**
* FIELD_PREP_CONST() - prepare a constant bitfield element
- * @_mask: shifted mask defining the field's length and position
- * @_val: value to put in the field
+ * @mask: shifted mask defining the field's length and position
+ * @val: value to put in the field
*
* FIELD_PREP_CONST() masks and shifts up the value. The result should
* be combined with other fields of the bitfield using logical OR.
@@ -136,14 +136,14 @@
* be used in initializers. Error checking is less comfortable for this
* version, and non-constant masks cannot be used.
*/
-#define FIELD_PREP_CONST(_mask, _val) \
+#define FIELD_PREP_CONST(mask, val) \
( \
/* mask must be non-zero and contiguous */ \
- BUILD_BUG_ON_ZERO(__BF_VALIDATE_MASK(_mask)) + \
+ BUILD_BUG_ON_ZERO(__BF_VALIDATE_MASK(mask)) + \
/* check if value fits */ \
- BUILD_BUG_ON_ZERO(~((_mask) >> __bf_shf(_mask)) & (_val)) + \
+ BUILD_BUG_ON_ZERO(~((mask) >> __bf_shf(mask)) & (val)) + \
/* and create the value */ \
- (((typeof(_mask))(_val) << __bf_shf(_mask)) & (_mask)) \
+ (((typeof(mask))(val) << __bf_shf(mask)) & (mask)) \
)

/**
--
2.39.5