ASoC: ux500: Use guard() for mutex locks

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>
Link: https://patch.msgid.link/20260429075221.73989-1-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index 2e6ed19a18cdd4dcacac5f3b82fa70933102297d..2a459267f0f91de7656cbb7f6023cbac018014e9 100644 (file)
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -234,19 +234,18 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream,
                substream->number);
 
        /* Ensure configuration consistency between DAIs */
-       mutex_lock(&mop500_ab8500_params_lock);
-       if (mop500_ab8500_usage) {
-               if (mop500_ab8500_rate != params_rate(params) ||
-                   mop500_ab8500_channels != params_channels(params)) {
-                       mutex_unlock(&mop500_ab8500_params_lock);
-                       return -EBUSY;
+       scoped_guard(mutex, &mop500_ab8500_params_lock) {
+               if (mop500_ab8500_usage) {
+                       if (mop500_ab8500_rate != params_rate(params) ||
+                           mop500_ab8500_channels != params_channels(params)) {
+                               return -EBUSY;
+                       }
+               } else {
+                       mop500_ab8500_rate = params_rate(params);
+                       mop500_ab8500_channels = params_channels(params);
                }
-       } else {
-               mop500_ab8500_rate = params_rate(params);
-               mop500_ab8500_channels = params_channels(params);
+               __set_bit(cpu_dai->id, &mop500_ab8500_usage);
        }
-       __set_bit(cpu_dai->id, &mop500_ab8500_usage);
-       mutex_unlock(&mop500_ab8500_params_lock);
 
        channels = params_channels(params);
 
@@ -339,9 +338,8 @@ static int mop500_ab8500_hw_free(struct snd_pcm_substream *substream)
        struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
        struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
 
-       mutex_lock(&mop500_ab8500_params_lock);
+       guard(mutex)(&mop500_ab8500_params_lock);
        __clear_bit(cpu_dai->id, &mop500_ab8500_usage);
-       mutex_unlock(&mop500_ab8500_params_lock);
 
        return 0;
 }