Re: [PATCH 21/26] ASoC: codecs: wm8958: Use guard() for mutex locks

Richard Fitzgerald <[email protected]>
Newsgroups gmane.linux.ports.arm.msm,gmane.linux.kernel,gmane.linux.sound
Message-ID <[email protected]>
On 23/07/2026 5:53 am, [email protected] wrote:
> From: bui duc phuc <[email protected]>
> 
> Clean up the code using guard() for mutex locks.
> Merely code refactoring, and no behavior change.
> 
> Signed-off-by: bui duc phuc <[email protected]>
> ---
>   sound/soc/codecs/wm8958-dsp2.c | 10 ++++------
>   1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
> index 8ff0882732e7..f75a6dc9d2bb 100644
> --- a/sound/soc/codecs/wm8958-dsp2.c
> +++ b/sound/soc/codecs/wm8958-dsp2.c
> @@ -7,6 +7,7 @@
>    * Author: Mark Brown <[email protected]>
>    */
>   
> +#include <linux/cleanup.h>
>   #include <linux/module.h>
>   #include <linux/moduleparam.h>
>   #include <linux/init.h>
> @@ -864,9 +865,8 @@ static void wm8958_enh_eq_loaded(const struct firmware *fw, void *context)
>   	struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
>   
>   	if (fw && (wm8958_dsp2_fw(component, "ENH_EQ", fw, true) == 0)) {
> -		mutex_lock(&wm8994->fw_lock);
> +		guard(mutex)(&wm8994->fw_lock);
>   		wm8994->enh_eq = fw;
> -		mutex_unlock(&wm8994->fw_lock);
>   	}
>   }
>   
> @@ -876,9 +876,8 @@ static void wm8958_mbc_vss_loaded(const struct firmware *fw, void *context)
>   	struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
>   
>   	if (fw && (wm8958_dsp2_fw(component, "MBC+VSS", fw, true) == 0)) {
> -		mutex_lock(&wm8994->fw_lock);
> +		guard(mutex)(&wm8994->fw_lock);
>   		wm8994->mbc_vss = fw;
> -		mutex_unlock(&wm8994->fw_lock);
>   	}
>   }
>   
> @@ -888,9 +887,8 @@ static void wm8958_mbc_loaded(const struct firmware *fw, void *context)
>   	struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
>   
>   	if (fw && (wm8958_dsp2_fw(component, "MBC", fw, true) == 0)) {
> -		mutex_lock(&wm8994->fw_lock);
> +		guard(mutex)(&wm8994->fw_lock);
>   		wm8994->mbc = fw;
> -		mutex_unlock(&wm8994->fw_lock);
>   	}
>   }
>   

Reviewed-by: Richard Fitzgerald <[email protected]>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.