]> www.infradead.org Git - users/hch/misc.git/commitdiff
ALSA: opl3: Use guard() for mutex locks
authorTakashi Iwai <tiwai@suse.de>
Fri, 29 Aug 2025 15:00:14 +0000 (17:00 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Sep 2025 11:53:34 +0000 (13:53 +0200)
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-4-tiwai@suse.de
sound/drivers/opl3/opl3_seq.c

index 9fc78b7fb78083ea2cf138b27bcc5d839dc0badd..8db77a81476c008ceef50530e2e750d21aca3d6c 100644 (file)
@@ -40,13 +40,11 @@ int snd_opl3_synth_setup(struct snd_opl3 * opl3)
        int idx;
        struct snd_hwdep *hwdep = opl3->hwdep;
 
-       mutex_lock(&hwdep->open_mutex);
-       if (hwdep->used) {
-               mutex_unlock(&hwdep->open_mutex);
-               return -EBUSY;
+       scoped_guard(mutex, &hwdep->open_mutex) {
+               if (hwdep->used)
+                       return -EBUSY;
+               hwdep->used++;
        }
-       hwdep->used++;
-       mutex_unlock(&hwdep->open_mutex);
 
        snd_opl3_reset(opl3);
 
@@ -81,9 +79,9 @@ void snd_opl3_synth_cleanup(struct snd_opl3 * opl3)
 
        snd_opl3_reset(opl3);
        hwdep = opl3->hwdep;
-       mutex_lock(&hwdep->open_mutex);
-       hwdep->used--;
-       mutex_unlock(&hwdep->open_mutex);
+       scoped_guard(mutex, &hwdep->open_mutex) {
+               hwdep->used--;
+       }
        wake_up(&hwdep->open_wait);
 }