From: "tip-bot2 for Thomas Weißschuh" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
linux@weissschuh.net,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Boqun Feng <boqun.feng@gmail.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] locking/mutex: Mark devm_mutex_init() as __must_check
Date: Sat, 19 Jul 2025 17:40:15 -0000 [thread overview]
Message-ID: <175294681519.1420.7884388812046996076.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250617-must_check-devm_mutex_init-v7-3-d9e449f4d224@weissschuh.net>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: daec29dcc8731b7596690ab9f647839e4584a86d
Gitweb: https://git.kernel.org/tip/daec29dcc8731b7596690ab9f647839e4584a86d
Author: Thomas Weißschuh <linux@weissschuh.net>
AuthorDate: Tue, 17 Jun 2025 19:08:14 +02:00
Committer: Boqun Feng <boqun.feng@gmail.com>
CommitterDate: Fri, 11 Jul 2025 15:11:54 -07:00
locking/mutex: Mark devm_mutex_init() as __must_check
devm_mutex_init() can fail. With CONFIG_DEBUG_MUTEXES=y the mutex will be
marked as unusable and trigger errors on usage.
Enforce all callers check the return value through the compiler.
As devm_mutex_init() itself is a macro, it can not be annotated
directly. Annotate __devm_mutex_init() instead.
Unfortunately __must_check/warn_unused_result don't propagate through
statement expression. So move the statement expression into the argument
list of the call to __devm_mutex_init() through a helper macro.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/r/20250617-must_check-devm_mutex_init-v7-3-d9e449f4d224@weissschuh.net
---
include/linux/mutex.h | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index a039fa8..00afd34 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -126,11 +126,11 @@ do { \
#ifdef CONFIG_DEBUG_MUTEXES
-int __devm_mutex_init(struct device *dev, struct mutex *lock);
+int __must_check __devm_mutex_init(struct device *dev, struct mutex *lock);
#else
-static inline int __devm_mutex_init(struct device *dev, struct mutex *lock)
+static inline int __must_check __devm_mutex_init(struct device *dev, struct mutex *lock)
{
/*
* When CONFIG_DEBUG_MUTEXES is off mutex_destroy() is just a nop so
@@ -141,14 +141,17 @@ static inline int __devm_mutex_init(struct device *dev, struct mutex *lock)
#endif
-#define devm_mutex_init(dev, mutex) \
+#define __mutex_init_ret(mutex) \
({ \
typeof(mutex) mutex_ = (mutex); \
\
mutex_init(mutex_); \
- __devm_mutex_init(dev, mutex_); \
+ mutex_; \
})
+#define devm_mutex_init(dev, mutex) \
+ __devm_mutex_init(dev, __mutex_init_ret(mutex))
+
/*
* See kernel/locking/mutex.c for detailed documentation of these APIs.
* Also see Documentation/locking/mutex-design.rst.
next prev parent reply other threads:[~2025-07-19 17:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-17 17:08 [PATCH v7 0/3] " Thomas Weißschuh
2025-06-17 17:08 ` [PATCH v7 1/3] spi: spi-nxp-fspi: check return value of devm_mutex_init() Thomas Weißschuh
2025-06-17 19:02 ` Mark Brown
2025-07-19 17:40 ` [tip: locking/core] spi: spi-nxp-fspi: Check " tip-bot2 for Thomas Weißschuh
2025-06-17 17:08 ` [PATCH v7 2/3] leds: lp8860: " Thomas Weißschuh
2025-06-19 12:34 ` (subset) " Lee Jones
2025-06-19 15:34 ` Thomas Weißschuh
2025-06-25 9:04 ` Lee Jones
2025-06-26 10:54 ` Thomas Weißschuh
2025-06-27 12:58 ` Lee Jones
2025-07-19 17:40 ` [tip: locking/core] " tip-bot2 for Thomas Weißschuh
2025-06-17 17:08 ` [PATCH v7 3/3] locking/mutex: Mark devm_mutex_init() as __must_check Thomas Weißschuh
2025-06-17 17:32 ` Boqun Feng
2025-07-19 17:40 ` tip-bot2 for Thomas Weißschuh [this message]
2025-07-11 22:12 ` [PATCH v7 0/3] " Boqun Feng
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=175294681519.1420.7884388812046996076.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=boqun.feng@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@weissschuh.net \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/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
all inboxes | Powered by JetHome®