]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ALSA: sis7019: Use guard() for mutex locks
authorTakashi Iwai <tiwai@suse.de>
Fri, 29 Aug 2025 14:43:29 +0000 (16:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Sep 2025 11:52:42 +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-55-tiwai@suse.de
sound/pci/sis7019.c

index 3d7abcb316790276d455c5c4c1c5bdfbae164fa8..a1341af8c41feb696666dbbe2bd05db769b10d18 100644 (file)
@@ -902,7 +902,7 @@ static unsigned short sis_ac97_rw(struct sis7019 *sis, int codec, u32 cmd)
        /* Get the AC97 semaphore -- software first, so we don't spin
         * pounding out IO reads on the hardware semaphore...
         */
-       mutex_lock(&sis->ac97_mutex);
+       guard(mutex)(&sis->ac97_mutex);
 
        count = 0xffff;
        while ((inw(io + SIS_AC97_SEMA) & SIS_AC97_SEMA_BUSY) && --count)
@@ -941,8 +941,6 @@ static unsigned short sis_ac97_rw(struct sis7019 *sis, int codec, u32 cmd)
 timeout_sema:
        outl(SIS_AC97_SEMA_RELEASE, io + SIS_AC97_SEMA);
 timeout:
-       mutex_unlock(&sis->ac97_mutex);
-
        if (!count) {
                dev_err(&sis->pci->dev, "ac97 codec %d timeout cmd 0x%08x\n",
                                        codec, cmd);