]> www.infradead.org Git - users/hch/misc.git/commitdiff
ALSA: korg1212: Use guard() for mutex locks
authorTakashi Iwai <tiwai@suse.de>
Fri, 29 Aug 2025 14:43:12 +0000 (16:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Sep 2025 11:52:41 +0000 (13:52 +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/20250829144342.4290-38-tiwai@suse.de
sound/pci/korg1212/korg1212.c

index 0a66d5cfc090eabe6263151221c44e4eaa66fbd8..26c515ec76e9b26fe93e1bff6eb230d89242fddb 100644 (file)
@@ -606,13 +606,12 @@ static int snd_korg1212_OpenCard(struct snd_korg1212 * korg1212)
 {
        K1212_DEBUG_PRINTK("K1212_DEBUG: OpenCard [%s] %d\n",
                           stateName[korg1212->cardState], korg1212->opencnt);
-       mutex_lock(&korg1212->open_mutex);
+       guard(mutex)(&korg1212->open_mutex);
         if (korg1212->opencnt++ == 0) {
                snd_korg1212_TurnOffIdleMonitor(korg1212);
                snd_korg1212_setCardState(korg1212, K1212_STATE_OPEN);
        }
 
-       mutex_unlock(&korg1212->open_mutex);
         return 1;
 }
 
@@ -621,11 +620,9 @@ static int snd_korg1212_CloseCard(struct snd_korg1212 * korg1212)
        K1212_DEBUG_PRINTK("K1212_DEBUG: CloseCard [%s] %d\n",
                           stateName[korg1212->cardState], korg1212->opencnt);
 
-       mutex_lock(&korg1212->open_mutex);
-       if (--(korg1212->opencnt)) {
-               mutex_unlock(&korg1212->open_mutex);
+       guard(mutex)(&korg1212->open_mutex);
+       if (--(korg1212->opencnt))
                return 0;
-       }
 
         if (korg1212->cardState == K1212_STATE_SETUP) {
                 int rc = snd_korg1212_Send1212Command(korg1212, K1212_DB_SelectPlayMode,
@@ -633,10 +630,8 @@ static int snd_korg1212_CloseCard(struct snd_korg1212 * korg1212)
                if (rc)
                        K1212_DEBUG_PRINTK("K1212_DEBUG: CloseCard - RC = %d [%s]\n",
                                           rc, stateName[korg1212->cardState]);
-               if (rc != K1212_CMDRET_Success) {
-                       mutex_unlock(&korg1212->open_mutex);
+               if (rc != K1212_CMDRET_Success)
                         return 0;
-               }
         } else if (korg1212->cardState > K1212_STATE_SETUP) {
                snd_korg1212_SendStopAndWait(korg1212);
         }
@@ -646,7 +641,6 @@ static int snd_korg1212_CloseCard(struct snd_korg1212 * korg1212)
                 snd_korg1212_setCardState(korg1212, K1212_STATE_READY);
        }
 
-       mutex_unlock(&korg1212->open_mutex);
         return 0;
 }