summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>2025-10-31 18:33:15 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-11-02 22:15:22 +0900
commit17143f5b09671f21e7b3ea46367ea99755589fe0 (patch)
treed38a75a5176ed14f8cb69145d6a286822b2e5370
parent6f3af8055ee7ab69d1451f056fcd890df99c167e (diff)
downloadlinux-17143f5b09671f21e7b3ea46367ea99755589fe0.tar.gz
linux-17143f5b09671f21e7b3ea46367ea99755589fe0.tar.bz2
linux-17143f5b09671f21e7b3ea46367ea99755589fe0.zip
bits: add comments and newlines to #if, #else and #endif directives
[ Upstream commit 31299a5e0211241171b2222c5633aad4763bf700 ] This is a preparation for the upcoming GENMASK_U*() and BIT_U*() changes. After introducing those new macros, there will be a lot of scrolling between the #if, #else and #endif. Add a comment to the #else and #endif preprocessor macros to help keep track of which context we are in. Also, add new lines to better visually separate the non-asm and asm sections. Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Yury Norov <yury.norov@gmail.com> Stable-dep-of: 2ba5772e530f ("gpio: idio-16: Define fixed direction of the GPIO lines") Signed-off-by: William Breathitt Gray <wbg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/linux/bits.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/bits.h b/include/linux/bits.h
index 60044b608817..18143b536d9d 100644
--- a/include/linux/bits.h
+++ b/include/linux/bits.h
@@ -19,17 +19,21 @@
* GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
*/
#if !defined(__ASSEMBLY__)
+
#include <linux/build_bug.h>
#define GENMASK_INPUT_CHECK(h, l) \
(BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
__is_constexpr((l) > (h)), (l) > (h), 0)))
-#else
+
+#else /* defined(__ASSEMBLY__) */
+
/*
* BUILD_BUG_ON_ZERO is not available in h files included from asm files,
* disable the input check if that is the case.
*/
#define GENMASK_INPUT_CHECK(h, l) 0
-#endif
+
+#endif /* !defined(__ASSEMBLY__) */
#define GENMASK(h, l) \
(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))