]> www.infradead.org Git - users/hch/misc.git/commitdiff
ALSA: nm256: Use guard() for mutex locks
authorTakashi Iwai <tiwai@suse.de>
Fri, 29 Aug 2025 14:43:19 +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-45-tiwai@suse.de
sound/pci/nm256/nm256.c

index 39464d171f6bf7b74b49891d9a88227492f6659b..7b2c986bb5ef5d1fbd8caa7e029c7b264d41031c 100644 (file)
@@ -446,27 +446,25 @@ snd_nm256_set_format(struct nm256 *chip, struct nm256_stream *s,
 /* acquire interrupt */
 static int snd_nm256_acquire_irq(struct nm256 *chip)
 {
-       mutex_lock(&chip->irq_mutex);
+       guard(mutex)(&chip->irq_mutex);
        if (chip->irq < 0) {
                if (request_irq(chip->pci->irq, chip->interrupt, IRQF_SHARED,
                                KBUILD_MODNAME, chip)) {
                        dev_err(chip->card->dev,
                                "unable to grab IRQ %d\n", chip->pci->irq);
-                       mutex_unlock(&chip->irq_mutex);
                        return -EBUSY;
                }
                chip->irq = chip->pci->irq;
                chip->card->sync_irq = chip->irq;
        }
        chip->irq_acks++;
-       mutex_unlock(&chip->irq_mutex);
        return 0;
 }
 
 /* release interrupt */
 static void snd_nm256_release_irq(struct nm256 *chip)
 {
-       mutex_lock(&chip->irq_mutex);
+       guard(mutex)(&chip->irq_mutex);
        if (chip->irq_acks > 0)
                chip->irq_acks--;
        if (chip->irq_acks == 0 && chip->irq >= 0) {
@@ -474,7 +472,6 @@ static void snd_nm256_release_irq(struct nm256 *chip)
                chip->irq = -1;
                chip->card->sync_irq = -1;
        }
-       mutex_unlock(&chip->irq_mutex);
 }
 
 /*