From: Boqun Feng <boqun.feng@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Thomas Gleixner" <tglx@linutronix•de>,
"Ingo Molnar" <mingo@kernel•org>,
"H. Peter Anvin" <hpa@zytor•com>,
"Peter Zijlstra" <peterz@infradead•org>,
"Mark Brown" <broonie@kernel•org>,
"Liam Girdwood" <lgirdwood@gmail•com>,
"Thomas Weißschuh" <linux@weissschuh•net>,
"Charles Keepax" <ckeepax@opensource•cirrus.com>,
"Maciej Strozek" <mstrozek@opensource•cirrus.com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: Re: linux-next: semantic conflict between the tip and sound-asoc trees
Date: Mon, 21 Jul 2025 20:15:50 -0700 [thread overview]
Message-ID: <aH8CZooigrI4mmKB@tardis-2.local> (raw)
In-Reply-To: <20250722130140.74182f72@canb.auug.org.au>
On Tue, Jul 22, 2025 at 01:01:40PM +1000, Stephen Rothwell wrote:
> Hi all,
>
Hi Stephen,
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from include/linux/kernfs.h:11,
> from include/linux/sysfs.h:16,
> from include/linux/kobject.h:20,
> from include/linux/energy_model.h:7,
> from include/linux/device.h:16,
> from sound/soc/sdca/sdca_interrupts.c:13:
> sound/soc/sdca/sdca_interrupts.c: In function 'sdca_irq_allocate':
> include/linux/mutex.h:153:9: error: ignoring return value of '__devm_mutex_init' declared with attribute 'warn_unused_result' [-Werror=unused-result]
> 153 | __devm_mutex_init(dev, __mutex_init_ret(mutex))
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> sound/soc/sdca/sdca_interrupts.c:422:9: note: in expansion of macro 'devm_mutex_init'
> 422 | devm_mutex_init(dev, &info->irq_lock);
> | ^~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> daec29dcc873 ("locking/mutex: Mark devm_mutex_init() as __must_check")
>
> interacting with commit
>
> b126394d9ec6 ("ASoC: SDCA: Generic interrupt support")
>
> from the sound-asoc tree.
>
> I have applied the following merge fix patch (just a hack, something
> better needs to be done).
>
Thanks for spotting this, I think it'll be easier if sound-asoc tree
could apply this change (with proper error handling). Maciej, Charles
and Mark, does it sound good? Apologies that I was a bit late for
locking changes in this cycle. Thanks!
Regards,
Boqun
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 22 Jul 2025 12:26:10 +1000
> Subject: [PATCH] fix up for "ASoC: SDCA: Generic interrupt support"
>
> interacting with "locking/mutex: Mark devm_mutex_init() as
> __must_check".
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> sound/soc/sdca/sdca_interrupts.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/sdca/sdca_interrupts.c b/sound/soc/sdca/sdca_interrupts.c
> index b76512732af8..b393471e9760 100644
> --- a/sound/soc/sdca/sdca_interrupts.c
> +++ b/sound/soc/sdca/sdca_interrupts.c
> @@ -419,7 +419,11 @@ struct sdca_interrupt_info *sdca_irq_allocate(struct device *dev,
>
> info->irq_chip = sdca_irq_chip;
>
> - devm_mutex_init(dev, &info->irq_lock);
> + ret = devm_mutex_init(dev, &info->irq_lock);
> + if (ret) {
> + /* do some error recovery */
> + return ERR_PTR(ret);
> + }
>
> ret = devm_regmap_add_irq_chip(dev, regmap, irq, IRQF_ONESHOT, 0,
> &info->irq_chip, &info->irq_data);
> --
> 2.50.1
>
> --
> Cheers,
> Stephen Rothwell
next prev parent reply other threads:[~2025-07-22 3:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-22 3:01 linux-next: semantic conflict between the tip and sound-asoc trees Stephen Rothwell
2025-07-22 3:15 ` Boqun Feng [this message]
2025-07-22 8:59 ` Charles Keepax
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=aH8CZooigrI4mmKB@tardis-2.local \
--to=boqun.feng@gmail$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=ckeepax@opensource$(echo .)cirrus.com \
--cc=hpa@zytor$(echo .)com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@weissschuh$(echo .)net \
--cc=mingo@kernel$(echo .)org \
--cc=mstrozek@opensource$(echo .)cirrus.com \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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