ALSA: opti9xx: 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/20250829145300.5460-12-tiwai@suse.de

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index ad7180d7c0c2b1ac6da997f110868c64f66885c7..c320af3e9a05c500fec64c8c1683657aff314989 100644 (file)
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -822,10 +822,9 @@ static int snd_miro_init(struct snd_miro *chip,
 static unsigned char snd_miro_read(struct snd_miro *chip,
                                   unsigned char reg)
 {
-       unsigned long flags;
        unsigned char retval = 0xff;
 
-       spin_lock_irqsave(&chip->lock, flags);
+       guard(spinlock_irqsave)(&chip->lock);
        outb(chip->password, chip->mc_base + chip->pwd_reg);
 
        switch (chip->hardware) {
@@ -846,16 +845,13 @@ static unsigned char snd_miro_read(struct snd_miro *chip,
                dev_err(chip->card->dev, "sorry, no support for %d\n", chip->hardware);
        }
 
-       spin_unlock_irqrestore(&chip->lock, flags);
        return retval;
 }
 
 static void snd_miro_write(struct snd_miro *chip, unsigned char reg,
                           unsigned char value)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(&chip->lock, flags);
+       guard(spinlock_irqsave)(&chip->lock);
        outb(chip->password, chip->mc_base + chip->pwd_reg);
 
        switch (chip->hardware) {
@@ -875,8 +871,6 @@ static void snd_miro_write(struct snd_miro *chip, unsigned char reg,
        default:
                dev_err(chip->card->dev, "sorry, no support for %d\n", chip->hardware);
        }
-
-       spin_unlock_irqrestore(&chip->lock, flags);
 }
 
 static inline void snd_miro_write_mask(struct snd_miro *chip,
@@ -1013,7 +1007,6 @@ static int snd_miro_configure(struct snd_miro *chip)
        unsigned char dma_bits;
        unsigned char mpu_port_bits = 0;
        unsigned char mpu_irq_bits;
-       unsigned long flags;
 
        snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80);
        snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */
@@ -1109,9 +1102,9 @@ __skip_base:
        }
        dma_bits |= 0x04;
 
-       spin_lock_irqsave(&chip->lock, flags);
-       outb(irq_bits << 3 | dma_bits, chip->wss_base);
-       spin_unlock_irqrestore(&chip->lock, flags);
+       scoped_guard(spinlock_irqsave, &chip->lock) {
+               outb(irq_bits << 3 | dma_bits, chip->wss_base);
+       }
 
 __skip_resources:
        if (chip->hardware > OPTi9XX_HW_82C928) {

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 328d043a1619384797f26ac059c119aa3c11a1b4..abaa3ed3ab5c2f49791ac12967a84fd184ac48ea 100644 (file)
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -228,10 +228,9 @@ static int snd_opti9xx_init(struct snd_opti9xx *chip,
 static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,
                                      unsigned char reg)
 {
-       unsigned long flags;
        unsigned char retval = 0xff;
 
-       spin_lock_irqsave(&chip->lock, flags);
+       guard(spinlock_irqsave)(&chip->lock);
        outb(chip->password, chip->mc_base + chip->pwd_reg);
 
        switch (chip->hardware) {
@@ -265,16 +264,13 @@ static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,
                dev_err(chip->card->dev, "chip %d not supported\n", chip->hardware);
        }
 
-       spin_unlock_irqrestore(&chip->lock, flags);
        return retval;
 }
 
 static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,
                              unsigned char value)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(&chip->lock, flags);
+       guard(spinlock_irqsave)(&chip->lock);
        outb(chip->password, chip->mc_base + chip->pwd_reg);
 
        switch (chip->hardware) {
@@ -307,8 +303,6 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,
        default:
                dev_err(chip->card->dev, "chip %d not supported\n", chip->hardware);
        }
-
-       spin_unlock_irqrestore(&chip->lock, flags);
 }
 
 
@@ -659,9 +653,6 @@ static int snd_opti9xx_read_check(struct snd_card *card,
                                  struct snd_opti9xx *chip)
 {
        unsigned char value;
-#ifdef OPTi93X
-       unsigned long flags;
-#endif
 
        chip->res_mc_base =
                devm_request_region(card->dev, chip->mc_base,
@@ -680,10 +671,10 @@ static int snd_opti9xx_read_check(struct snd_card *card,
        if (!chip->res_mc_indir)
                return -EBUSY;
 
-       spin_lock_irqsave(&chip->lock, flags);
-       outb(chip->password, chip->mc_base + chip->pwd_reg);
-       outb(((chip->mc_indir_index & 0x1f0) >> 4), chip->mc_base);
-       spin_unlock_irqrestore(&chip->lock, flags);
+       scoped_guard(spinlock_irqsave, &chip->lock) {
+               outb(chip->password, chip->mc_base + chip->pwd_reg);
+               outb(((chip->mc_indir_index & 0x1f0) >> 4), chip->mc_base);
+       }
 
        value = snd_opti9xx_read(chip, OPTi9XX_MC_REG(7));
        snd_opti9xx_write(chip, OPTi9XX_MC_REG(7), 0xff - value);