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

index 1d7aab14579e1d658b89294f4a2469004acb7121..bf9b3c84f554f76d1de870cd63ed6f3c4b0c88ae 100644 (file)
@@ -347,7 +347,7 @@ static int snd_aw2_pcm_prepare_playback(struct snd_pcm_substream *substream)
        struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned long period_size, buffer_size;
 
-       mutex_lock(&chip->mtx);
+       guard(mutex)(&chip->mtx);
 
        period_size = snd_pcm_lib_period_bytes(substream);
        buffer_size = snd_pcm_lib_buffer_bytes(substream);
@@ -363,8 +363,6 @@ static int snd_aw2_pcm_prepare_playback(struct snd_pcm_substream *substream)
                                                    snd_pcm_period_elapsed,
                                                    (void *)substream);
 
-       mutex_unlock(&chip->mtx);
-
        return 0;
 }
 
@@ -376,7 +374,7 @@ static int snd_aw2_pcm_prepare_capture(struct snd_pcm_substream *substream)
        struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned long period_size, buffer_size;
 
-       mutex_lock(&chip->mtx);
+       guard(mutex)(&chip->mtx);
 
        period_size = snd_pcm_lib_period_bytes(substream);
        buffer_size = snd_pcm_lib_buffer_bytes(substream);
@@ -392,8 +390,6 @@ static int snd_aw2_pcm_prepare_capture(struct snd_pcm_substream *substream)
                                                   snd_pcm_period_elapsed,
                                                   (void *)substream);
 
-       mutex_unlock(&chip->mtx);
-
        return 0;
 }