From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: phucduc.bui@gmail.com, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Lars-Peter Clausen <lars@metafoo.de>,
nuno.sa@analog.com, Shenghao Ding <shenghao-ding@ti.com>,
Kevin Lu <kevin-lu@ti.com>
Cc: Baojun Xu <baojun.xu@ti.com>, Sen Wang <sen@ti.com>,
Steven Eckhoff <steven.eckhoff.opensource@gmail.com>,
Srinivas Kandagatla <srini@kernel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Charles Keepax <ckeepax@opensource.cirrus.com>,
Linus Walleij <linusw@kernel.org>,
u.kleine-koenig@baylibre.com,
Thorsten Blum <thorsten.blum@linux.dev>,
Kees Cook <kees@kernel.org>, Chen Ni <nichen@iscas.ac.cn>,
Bartosz Golaszewski <brgl@kernel.org>,
Shengjiu Wang <shengjiu.wang@nxp.com>,
Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>,
Pengpeng Hou <pengpeng@iscas.ac.cn>,
patches@opensource.cirrus.com, linux-kernel@vger.kernel.org,
linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: Re: [PATCH 23/26] ASoC: codecs: wm8994: Use guard() for mutex locks
Date: Thu, 23 Jul 2026 10:48:12 +0100 [thread overview]
Message-ID: <155ca08d-7591-427c-8db3-5329632d10e3@opensource.cirrus.com> (raw)
In-Reply-To: <20260723045327.28260-24-phucduc.bui@gmail.com>
On 23/07/2026 5:53 am, phucduc.bui@gmail.com wrote:
> From: bui duc phuc <phucduc.bui@gmail.com>
>
> Clean up the code using guard() for mutex locks.
> Merely code refactoring, and no behavior change.
>
> Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
> ---
> sound/soc/codecs/wm8994.c | 30 ++++++++----------------------
> 1 file changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
> index 1d64c7c42ed1..8bf58a6a8af7 100644
> --- a/sound/soc/codecs/wm8994.c
> +++ b/sound/soc/codecs/wm8994.c
> @@ -7,6 +7,7 @@
> * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
> */
>
> +#include <linux/cleanup.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> #include <linux/init.h>
> @@ -766,7 +767,7 @@ static void active_reference(struct snd_soc_component *component)
> {
> struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
>
> - mutex_lock(&wm8994->accdet_lock);
> + guard(mutex)(&wm8994->accdet_lock);
>
> wm8994->active_refcount++;
>
> @@ -775,8 +776,6 @@ static void active_reference(struct snd_soc_component *component)
>
> /* If we're using jack detection go into audio mode */
> wm1811_jackdet_set_mode(component, WM1811_JACKDET_MODE_AUDIO);
> -
> - mutex_unlock(&wm8994->accdet_lock);
> }
>
> static void active_dereference(struct snd_soc_component *component)
> @@ -784,7 +783,7 @@ static void active_dereference(struct snd_soc_component *component)
> struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
> u16 mode;
>
> - mutex_lock(&wm8994->accdet_lock);
> + guard(mutex)(&wm8994->accdet_lock);
>
> wm8994->active_refcount--;
>
> @@ -800,8 +799,6 @@ static void active_dereference(struct snd_soc_component *component)
>
> wm1811_jackdet_set_mode(component, mode);
> }
> -
> - mutex_unlock(&wm8994->accdet_lock);
> }
>
> static int clk_sys_event(struct snd_soc_dapm_widget *w,
> @@ -3704,7 +3701,7 @@ static void wm8958_open_circuit_work(struct work_struct *work)
> open_circuit_work.work);
> struct device *dev = wm8994->wm8994->dev;
>
> - mutex_lock(&wm8994->accdet_lock);
> + guard(mutex)(&wm8994->accdet_lock);
>
> wm1811_micd_stop(wm8994->hubs.component);
>
> @@ -3718,8 +3715,6 @@ static void wm8958_open_circuit_work(struct work_struct *work)
> snd_soc_jack_report(wm8994->micdet[0].jack, 0,
> wm8994->btn_mask |
> SND_JACK_HEADSET);
> -
> - mutex_unlock(&wm8994->accdet_lock);
> }
>
> static void wm8958_mic_id(void *data, u16 status)
> @@ -3777,7 +3772,7 @@ static void wm1811_mic_work(struct work_struct *work)
> struct snd_soc_component *component = wm8994->hubs.component;
> struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
>
> - pm_runtime_get_sync(component->dev);
> + guard(pm_runtime_active)(component->dev);
>
> /* If required for an external cap force MICBIAS on */
> if (control->pdata.jd_ext_cap) {
> @@ -3785,7 +3780,7 @@ static void wm1811_mic_work(struct work_struct *work)
> snd_soc_dapm_sync(dapm);
> }
>
> - mutex_lock(&wm8994->accdet_lock);
> + guard(mutex)(&wm8994->accdet_lock);
>
> dev_dbg(component->dev, "Starting mic detection\n");
>
> @@ -3803,10 +3798,6 @@ static void wm1811_mic_work(struct work_struct *work)
> snd_soc_component_update_bits(component, WM8958_MIC_DETECT_1,
> WM8958_MICD_ENA, WM8958_MICD_ENA);
> }
> -
> - mutex_unlock(&wm8994->accdet_lock);
> -
> - pm_runtime_put(component->dev);
> }
>
> static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
> @@ -4026,15 +4017,10 @@ static void wm8958_mic_work(struct work_struct *work)
> mic_complete_work.work);
> struct snd_soc_component *component = wm8994->hubs.component;
>
> - pm_runtime_get_sync(component->dev);
> -
> - mutex_lock(&wm8994->accdet_lock);
> + guard(pm_runtime_active)(component->dev);
> + guard(mutex)(&wm8994->accdet_lock);
>
> wm8994->mic_id_cb(wm8994->mic_id_cb_data, wm8994->mic_status);
> -
> - mutex_unlock(&wm8994->accdet_lock);
> -
> - pm_runtime_put(component->dev);
> }
>
> static irqreturn_t wm8958_mic_irq(int irq, void *data)
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
next prev parent reply other threads:[~2026-07-23 9:48 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-23 4:53 [PATCH 00/26] ASoC: codecs: Use guard() for mutex & spin locks - part 3 phucduc.bui
2026-07-23 4:53 ` [PATCH 01/26] ASoC: codecs: sigmadsp: Use guard() for mutex locks phucduc.bui
2026-07-23 4:53 ` [PATCH 02/26] ASoC: codecs: sta350: " phucduc.bui
2026-07-23 4:53 ` [PATCH 03/26] ASoC: codecs: sta32x: " phucduc.bui
2026-07-23 4:53 ` [PATCH 04/26] ASoC: codecs: tas2781: " phucduc.bui
2026-07-23 4:53 ` [PATCH 05/26] ASoC: codecs: tas2783: " phucduc.bui
2026-07-23 4:53 ` [PATCH 06/26] ASoC: codecs: tas5805m: " phucduc.bui
2026-07-23 4:53 ` [PATCH 07/26] ASoC: codecs: tlv320dac33: Use guard() for mutex & spin locks phucduc.bui
2026-07-23 4:53 ` [PATCH 08/26] ASoC: codecs: tscs42xx: Use guard() for mutex locks phucduc.bui
2026-07-23 4:53 ` [PATCH 09/26] ASoC: codecs: tscs454: " phucduc.bui
2026-07-23 4:53 ` [PATCH 10/26] ASoC: codecs: twl6040: " phucduc.bui
2026-07-23 4:53 ` [PATCH 11/26] ASoC: codecs: wcd-mbhc: " phucduc.bui
2026-07-23 4:53 ` [PATCH 12/26] ASoC: codecs: wcd934x: " phucduc.bui
2026-07-23 4:53 ` [PATCH 13/26] ASoC: codecs: wcd937x: " phucduc.bui
2026-07-23 4:53 ` [PATCH 14/26] ASoC: codecs: wcd938x: " phucduc.bui
2026-07-23 4:53 ` [PATCH 15/26] ASoC: codecs: wcd939x: " phucduc.bui
2026-07-23 4:53 ` [PATCH 16/26] ASoC: codecs: wm0010: Use guard() for mutex & spin locks phucduc.bui
2026-07-23 9:30 ` Richard Fitzgerald
2026-07-23 4:53 ` [PATCH 17/26] ASoC: codecs: wm2000: Use guard() for mutex locks phucduc.bui
2026-07-23 9:50 ` Richard Fitzgerald
2026-07-23 4:53 ` [PATCH 18/26] ASoC: codecs: wm5102: " phucduc.bui
2026-07-23 9:51 ` Richard Fitzgerald
2026-07-23 10:46 ` Mark Brown
2026-07-23 4:53 ` [PATCH 19/26] ASoC: codecs: wm8731: " phucduc.bui
2026-07-23 9:55 ` Richard Fitzgerald
2026-07-23 4:53 ` [PATCH 20/26] ASoC: codecs: wm8903: " phucduc.bui
2026-07-23 9:56 ` Richard Fitzgerald
2026-07-23 4:53 ` [PATCH 21/26] ASoC: codecs: wm8958: " phucduc.bui
2026-07-23 9:54 ` Richard Fitzgerald
2026-07-23 4:53 ` [PATCH 22/26] ASoC: codecs: wm8962: " phucduc.bui
2026-07-23 9:53 ` Richard Fitzgerald
2026-07-23 4:53 ` [PATCH 23/26] ASoC: codecs: wm8994: " phucduc.bui
2026-07-23 9:48 ` Richard Fitzgerald [this message]
2026-07-23 4:53 ` [PATCH 24/26] ASoC: codecs: wm971x: " phucduc.bui
2026-07-23 4:53 ` [PATCH 25/26] ASoC: codecs: wm_adsp: " phucduc.bui
2026-07-23 9:42 ` Richard Fitzgerald
2026-07-23 9:50 ` Bui Duc Phuc
2026-07-23 4:53 ` [PATCH 26/26] ASoC: codecs: wsa88xx: " phucduc.bui
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=155ca08d-7591-427c-8db3-5329632d10e3@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=baojun.xu@ti.com \
--cc=brgl@kernel.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=kees@kernel.org \
--cc=kevin-lu@ti.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linusw@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=nichen@iscas.ac.cn \
--cc=nuno.sa@analog.com \
--cc=patches@opensource.cirrus.com \
--cc=pengpeng@iscas.ac.cn \
--cc=perex@perex.cz \
--cc=phucduc.bui@gmail.com \
--cc=sebastian.krzyszkowiak@puri.sm \
--cc=sen@ti.com \
--cc=shenghao-ding@ti.com \
--cc=shengjiu.wang@nxp.com \
--cc=srini@kernel.org \
--cc=steven.eckhoff.opensource@gmail.com \
--cc=thorsten.blum@linux.dev \
--cc=tiwai@suse.com \
--cc=u.kleine-koenig@baylibre.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
all inboxes | Powered by JetHome®