ALSA: ad1889: Use guard() for spin locks

Clean up the code using guard() for spin locks.

Merely code refactoring, and no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250829144342.4290-10-tiwai@suse.de

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 020cbb467e7e68a0a74999b72607ed2d582ea3f8..f4ec404c0d15a2be8b013c857d680e507af79df2 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -353,7 +353,7 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)
                reg |= AD_DS_WSMC_WAST;
 
        /* let's make sure we don't clobber ourselves */
-       spin_lock_irq(&chip->lock);
+       guard(spinlock_irq)(&chip->lock);
        
        chip->wave.size = size;
        chip->wave.reg = reg;
@@ -372,8 +372,6 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)
        /* writes flush */
        ad1889_readw(chip, AD_DS_WSMC);
        
-       spin_unlock_irq(&chip->lock);
-       
        dev_dbg(chip->card->dev,
                "prepare playback: addr = 0x%x, count = %u, size = %u, reg = 0x%x, rate = %u\n",
                chip->wave.addr, count, size, reg, rt->rate);
@@ -403,7 +401,7 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)
                reg |= AD_DS_RAMC_ADST;
 
        /* let's make sure we don't clobber ourselves */
-       spin_lock_irq(&chip->lock);
+       guard(spinlock_irq)(&chip->lock);
        
        chip->ramc.size = size;
        chip->ramc.reg = reg;
@@ -419,8 +417,6 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)
        /* writes flush */
        ad1889_readw(chip, AD_DS_RAMC);
        
-       spin_unlock_irq(&chip->lock);
-       
        dev_dbg(chip->card->dev,
                "prepare capture: addr = 0x%x, count = %u, size = %u, reg = 0x%x, rate = %u\n",
                chip->ramc.addr, count, size, reg, rt->rate);
@@ -775,7 +771,7 @@ snd_ad1889_free(struct snd_card *card)
 {
        struct snd_ad1889 *chip = card->private_data;
 
-       spin_lock_irq(&chip->lock);
+       guard(spinlock_irq)(&chip->lock);
 
        ad1889_mute(chip);
 
@@ -785,8 +781,6 @@ snd_ad1889_free(struct snd_card *card)
        /* clear DISR. If we don't, we'd better jump off the Eiffel Tower */
        ad1889_writel(chip, AD_DMA_DISR, AD_DMA_DISR_PTAI | AD_DMA_DISR_PMAI);
        ad1889_readl(chip, AD_DMA_DISR);        /* flush, dammit! */
-
-       spin_unlock_irq(&chip->lock);
 }
 
 static int