From: William Breathitt Gray <wbg@kernel.org>
To: stable@vger.kernel.org
Cc: Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Yury Norov <yury.norov@gmail.com>,
William Breathitt Gray <wbg@kernel.org>
Subject: [PATCH 6.12.y 1/5] bits: add comments and newlines to #if, #else and #endif directives
Date: Fri, 31 Oct 2025 18:33:15 +0900 [thread overview]
Message-ID: <20251031093326.517803-1-wbg@kernel.org> (raw)
In-Reply-To: <2025102619-shortage-tabby-5157@gregkh>
From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
[ 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>
---
include/linux/bits.h | 8 ++++++--
1 file 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))
--
2.51.0
next prev parent reply other threads:[~2025-10-31 9:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-26 14:23 FAILED: patch "[PATCH] gpio: idio-16: Define fixed direction of the GPIO lines" failed to apply to 6.12-stable tree gregkh
2025-10-26 22:51 ` [PATCH 6.12.y] gpio: idio-16: Define fixed direction of the GPIO lines Sasha Levin
2025-10-27 6:48 ` William Breathitt Gray
2025-10-27 8:02 ` Greg KH
2025-10-31 9:33 ` William Breathitt Gray [this message]
2025-10-31 9:33 ` [PATCH 6.12.y 2/5] bits: introduce fixed-type GENMASK_U*() William Breathitt Gray
2025-10-31 9:33 ` [PATCH 6.12.y 3/5] gpio: regmap: Allow to allocate regmap-irq device William Breathitt Gray
2025-10-31 9:33 ` [PATCH 6.12.y 4/5] gpio: regmap: add the .fixed_direction_output configuration parameter William Breathitt Gray
2025-10-31 9:33 ` [PATCH 6.12.y 5/5] gpio: idio-16: Define fixed direction of the GPIO lines William Breathitt Gray
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251031093326.517803-1-wbg@kernel.org \
--to=wbg@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=mailhol.vincent@wanadoo.fr \
--cc=stable@vger.kernel.org \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox