ALSA: opl4: Use guard() for mutex locks

Replace the manual mutex lock/unlock pairs with guard() for code
simplification.

Only code refactoring, and no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250829150026.6379-6-tiwai@suse.de

diff --git a/sound/drivers/opl4/opl4_proc.c b/sound/drivers/opl4/opl4_proc.c
index f2149091e10aca037d526d1238e58d60b0e8aa05..fd0ba4704d9fc2fad6a82136fb9d4d9c292280ea 100644 (file)
--- a/sound/drivers/opl4/opl4_proc.c
+++ b/sound/drivers/opl4/opl4_proc.c
@@ -14,13 +14,10 @@ static int snd_opl4_mem_proc_open(struct snd_info_entry *entry,
 {
        struct snd_opl4 *opl4 = entry->private_data;
 
-       mutex_lock(&opl4->access_mutex);
-       if (opl4->memory_access) {
-               mutex_unlock(&opl4->access_mutex);
+       guard(mutex)(&opl4->access_mutex);
+       if (opl4->memory_access)
                return -EBUSY;
-       }
        opl4->memory_access++;
-       mutex_unlock(&opl4->access_mutex);
        return 0;
 }
 
@@ -29,9 +26,8 @@ static int snd_opl4_mem_proc_release(struct snd_info_entry *entry,
 {
        struct snd_opl4 *opl4 = entry->private_data;
 
-       mutex_lock(&opl4->access_mutex);
+       guard(mutex)(&opl4->access_mutex);
        opl4->memory_access--;
-       mutex_unlock(&opl4->access_mutex);
        return 0;
 }
 

diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
index f59ca660c6164e0019e284c2172e02f892e0ce6e..7bb22089a0934de2a6ce36d6aa94cada9c6395b6 100644 (file)
--- a/sound/drivers/opl4/opl4_seq.c
+++ b/sound/drivers/opl4/opl4_seq.c
@@ -63,24 +63,18 @@ static int snd_opl4_seq_use(void *private_data, struct snd_seq_port_subscribe *i
        struct snd_opl4 *opl4 = private_data;
        int err;
 
-       mutex_lock(&opl4->access_mutex);
-
-       if (opl4->used) {
-               mutex_unlock(&opl4->access_mutex);
-               return -EBUSY;
-       }
-       opl4->used++;
-
-       if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {
-               err = snd_opl4_seq_use_inc(opl4);
-               if (err < 0) {
-                       mutex_unlock(&opl4->access_mutex);
-                       return err;
+       scoped_guard(mutex, &opl4->access_mutex) {
+               if (opl4->used)
+                       return -EBUSY;
+               opl4->used++;
+
+               if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {
+                       err = snd_opl4_seq_use_inc(opl4);
+                       if (err < 0)
+                               return err;
                }
        }
 
-       mutex_unlock(&opl4->access_mutex);
-
        snd_opl4_synth_reset(opl4);
        return 0;
 }
@@ -91,9 +85,9 @@ static int snd_opl4_seq_unuse(void *private_data, struct snd_seq_port_subscribe
 
        snd_opl4_synth_shutdown(opl4);
 
-       mutex_lock(&opl4->access_mutex);
-       opl4->used--;
-       mutex_unlock(&opl4->access_mutex);
+       scoped_guard(mutex, &opl4->access_mutex) {
+               opl4->used--;
+       }
 
        if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM)
                snd_opl4_seq_use_dec(opl4);