Re: [PATCH 12/24] ASoC: codecs: cs-amp-lib: Use guard() for mutex locks

On 26/06/2026 7:13 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]>

It doesn't look cleaner.
But anyway,
Reviewed-by: Richard Fitzgerald <[email protected]>

> ---
>   sound/soc/codecs/cs-amp-lib.c | 11 +++++++----
>   1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/codecs/cs-amp-lib.c b/sound/soc/codecs/cs-amp-lib.c
> index 371e99205b58..41a9a5b005c6 100644
> --- a/sound/soc/codecs/cs-amp-lib.c
> +++ b/sound/soc/codecs/cs-amp-lib.c
> @@ -7,6 +7,7 @@
>   
>   #include <asm/byteorder.h>
>   #include <kunit/static_stub.h>
> +#include <linux/cleanup.h>
>   #include <linux/debugfs.h>
>   #include <linux/dev_printk.h>
>   #include <linux/efi.h>
> @@ -83,10 +84,12 @@ static int cs_amp_write_cal_coeff(struct cs_dsp *dsp,
>   	KUNIT_STATIC_STUB_REDIRECT(cs_amp_write_cal_coeff, dsp, controls, ctl_name, val);
>   
>   	if (IS_REACHABLE(CONFIG_FW_CS_DSP)) {
> -		mutex_lock(&dsp->pwr_lock);
> -		cs_ctl = cs_dsp_get_ctl(dsp, ctl_name, controls->mem_region, controls->alg_id);
> -		ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, &beval, sizeof(beval));
> -		mutex_unlock(&dsp->pwr_lock);
> +		scoped_guard(mutex, &dsp->pwr_lock) {
> +			cs_ctl = cs_dsp_get_ctl(dsp, ctl_name,
> +						controls->mem_region,
> +						controls->alg_id);
> +			ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, &beval, sizeof(beval));
> +		}
>   
>   		if (ret < 0) {
>   			dev_err(dsp->dev, "Failed to write to '%s': %d\n", ctl_name, ret);