ALSA: emu10k1x: 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-30-tiwai@suse.de

diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 8c18ad987223686992c7ab680f39134f79f91681..9607a0f7174b087ede2082e0c50cbd4fcd4f0ad3 100644 (file)
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -281,16 +281,13 @@ static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu,
                                          unsigned int reg, 
                                          unsigned int chn)
 {
-       unsigned long flags;
-       unsigned int regptr, val;
+       unsigned int regptr;
   
        regptr = (reg << 16) | chn;
 
-       spin_lock_irqsave(&emu->emu_lock, flags);
+       guard(spinlock_irqsave)(&emu->emu_lock);
        outl(regptr, emu->port + PTR);
-       val = inl(emu->port + DATA);
-       spin_unlock_irqrestore(&emu->emu_lock, flags);
-       return val;
+       return inl(emu->port + DATA);
 }
 
 static void snd_emu10k1x_ptr_write(struct emu10k1x *emu, 
@@ -299,45 +296,36 @@ static void snd_emu10k1x_ptr_write(struct emu10k1x *emu,
                                   unsigned int data)
 {
        unsigned int regptr;
-       unsigned long flags;
 
        regptr = (reg << 16) | chn;
 
-       spin_lock_irqsave(&emu->emu_lock, flags);
+       guard(spinlock_irqsave)(&emu->emu_lock);
        outl(regptr, emu->port + PTR);
        outl(data, emu->port + DATA);
-       spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_intr_enable(struct emu10k1x *emu, unsigned int intrenb)
 {
-       unsigned long flags;
        unsigned int intr_enable;
 
-       spin_lock_irqsave(&emu->emu_lock, flags);
+       guard(spinlock_irqsave)(&emu->emu_lock);
        intr_enable = inl(emu->port + INTE) | intrenb;
        outl(intr_enable, emu->port + INTE);
-       spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb)
 {
-       unsigned long flags;
        unsigned int intr_enable;
 
-       spin_lock_irqsave(&emu->emu_lock, flags);
+       guard(spinlock_irqsave)(&emu->emu_lock);
        intr_enable = inl(emu->port + INTE) & ~intrenb;
        outl(intr_enable, emu->port + INTE);
-       spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_gpio_write(struct emu10k1x *emu, unsigned int value)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(&emu->emu_lock, flags);
+       guard(spinlock_irqsave)(&emu->emu_lock);
        outl(value, emu->port + GPIO);
-       spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_pcm_free_substream(struct snd_pcm_runtime *runtime)
@@ -694,26 +682,20 @@ static unsigned short snd_emu10k1x_ac97_read(struct snd_ac97 *ac97,
                                             unsigned short reg)
 {
        struct emu10k1x *emu = ac97->private_data;
-       unsigned long flags;
-       unsigned short val;
   
-       spin_lock_irqsave(&emu->emu_lock, flags);
+       guard(spinlock_irqsave)(&emu->emu_lock);
        outb(reg, emu->port + AC97ADDRESS);
-       val = inw(emu->port + AC97DATA);
-       spin_unlock_irqrestore(&emu->emu_lock, flags);
-       return val;
+       return inw(emu->port + AC97DATA);
 }
 
 static void snd_emu10k1x_ac97_write(struct snd_ac97 *ac97,
                                    unsigned short reg, unsigned short val)
 {
        struct emu10k1x *emu = ac97->private_data;
-       unsigned long flags;
   
-       spin_lock_irqsave(&emu->emu_lock, flags);
+       guard(spinlock_irqsave)(&emu->emu_lock);
        outb(reg, emu->port + AC97ADDRESS);
        outw(val, emu->port + AC97DATA);
-       spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static int snd_emu10k1x_ac97(struct emu10k1x *chip)
@@ -966,14 +948,12 @@ static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry,
 {
        struct emu10k1x *emu = entry->private_data;
        unsigned long value,value1,value2;
-       unsigned long flags;
        int i;
 
        snd_iprintf(buffer, "Registers:\n\n");
        for(i = 0; i < 0x20; i+=4) {
-               spin_lock_irqsave(&emu->emu_lock, flags);
+               guard(spinlock_irqsave)(&emu->emu_lock);
                value = inl(emu->port + i);
-               spin_unlock_irqrestore(&emu->emu_lock, flags);
                snd_iprintf(buffer, "Register %02X: %08lX\n", i, value);
        }
        snd_iprintf(buffer, "\nRegisters\n\n");
@@ -1206,28 +1186,28 @@ static void do_emu10k1x_midi_interrupt(struct emu10k1x *emu,
                return;
        }
 
-       spin_lock(&midi->input_lock);
-       if ((status & midi->ipr_rx) && mpu401_input_avail(emu, midi)) {
-               if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
-                       mpu401_clear_rx(emu, midi);
-               } else {
-                       byte = mpu401_read_data(emu, midi);
-                       if (midi->substream_input)
-                               snd_rawmidi_receive(midi->substream_input, &byte, 1);
+       scoped_guard(spinlock, &midi->input_lock) {
+               if ((status & midi->ipr_rx) && mpu401_input_avail(emu, midi)) {
+                       if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
+                               mpu401_clear_rx(emu, midi);
+                       } else {
+                               byte = mpu401_read_data(emu, midi);
+                               if (midi->substream_input)
+                                       snd_rawmidi_receive(midi->substream_input, &byte, 1);
+                       }
                }
        }
-       spin_unlock(&midi->input_lock);
 
-       spin_lock(&midi->output_lock);
-       if ((status & midi->ipr_tx) && mpu401_output_ready(emu, midi)) {
-               if (midi->substream_output &&
-                   snd_rawmidi_transmit(midi->substream_output, &byte, 1) == 1) {
-                       mpu401_write_data(emu, midi, byte);
-               } else {
-                       snd_emu10k1x_intr_disable(emu, midi->tx_enable);
+       scoped_guard(spinlock, &midi->output_lock) {
+               if ((status & midi->ipr_tx) && mpu401_output_ready(emu, midi)) {
+                       if (midi->substream_output &&
+                           snd_rawmidi_transmit(midi->substream_output, &byte, 1) == 1) {
+                               mpu401_write_data(emu, midi, byte);
+                       } else {
+                               snd_emu10k1x_intr_disable(emu, midi->tx_enable);
+                       }
                }
        }
-       spin_unlock(&midi->output_lock);
 }
 
 static void snd_emu10k1x_midi_interrupt(struct emu10k1x *emu, unsigned int status)
@@ -1238,29 +1218,28 @@ static void snd_emu10k1x_midi_interrupt(struct emu10k1x *emu, unsigned int statu
 static int snd_emu10k1x_midi_cmd(struct emu10k1x * emu,
                                  struct emu10k1x_midi *midi, unsigned char cmd, int ack)
 {
-       unsigned long flags;
        int timeout, ok;
 
-       spin_lock_irqsave(&midi->input_lock, flags);
-       mpu401_write_data(emu, midi, 0x00);
-       /* mpu401_clear_rx(emu, midi); */
-
-       mpu401_write_cmd(emu, midi, cmd);
-       if (ack) {
-               ok = 0;
-               timeout = 10000;
-               while (!ok && timeout-- > 0) {
-                       if (mpu401_input_avail(emu, midi)) {
-                               if (mpu401_read_data(emu, midi) == MPU401_ACK)
-                                       ok = 1;
+       scoped_guard(spinlock_irqsave, &midi->input_lock) {
+               mpu401_write_data(emu, midi, 0x00);
+               /* mpu401_clear_rx(emu, midi); */
+
+               mpu401_write_cmd(emu, midi, cmd);
+               if (ack) {
+                       ok = 0;
+                       timeout = 10000;
+                       while (!ok && timeout-- > 0) {
+                               if (mpu401_input_avail(emu, midi)) {
+                                       if (mpu401_read_data(emu, midi) == MPU401_ACK)
+                                               ok = 1;
+                               }
                        }
-               }
-               if (!ok && mpu401_read_data(emu, midi) == MPU401_ACK)
+                       if (!ok && mpu401_read_data(emu, midi) == MPU401_ACK)
+                               ok = 1;
+               } else {
                        ok = 1;
-       } else {
-               ok = 1;
+               }
        }
-       spin_unlock_irqrestore(&midi->input_lock, flags);
        if (!ok) {
                dev_err(emu->card->dev,
                        "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
@@ -1276,100 +1255,78 @@ static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)
 {
        struct emu10k1x *emu;
        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-       unsigned long flags;
        
        emu = midi->emu;
        if (snd_BUG_ON(!emu))
                return -ENXIO;
-       spin_lock_irqsave(&midi->open_lock, flags);
-       midi->midi_mode |= EMU10K1X_MIDI_MODE_INPUT;
-       midi->substream_input = substream;
-       if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
-               if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
-                       goto error_out;
-               if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
-                       goto error_out;
-       } else {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
+       scoped_guard(spinlock_irqsave, &midi->open_lock) {
+               midi->midi_mode |= EMU10K1X_MIDI_MODE_INPUT;
+               midi->substream_input = substream;
+               if (midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)
+                       return 0;
        }
+       if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+               return -EIO;
+       if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+               return -EIO;
        return 0;
-
-error_out:
-       return -EIO;
 }
 
 static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream)
 {
        struct emu10k1x *emu;
        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-       unsigned long flags;
 
        emu = midi->emu;
        if (snd_BUG_ON(!emu))
                return -ENXIO;
-       spin_lock_irqsave(&midi->open_lock, flags);
-       midi->midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;
-       midi->substream_output = substream;
-       if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
-               if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
-                       goto error_out;
-               if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
-                       goto error_out;
-       } else {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
+       scoped_guard(spinlock_irqsave, &midi->open_lock) {
+               midi->midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;
+               midi->substream_output = substream;
+               if (midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)
+                       return 0;
        }
+       if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+               return -EIO;
+       if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+               return -EIO;
        return 0;
-
-error_out:
-       return -EIO;
 }
 
 static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream)
 {
        struct emu10k1x *emu;
        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-       unsigned long flags;
-       int err = 0;
 
        emu = midi->emu;
        if (snd_BUG_ON(!emu))
                return -ENXIO;
-       spin_lock_irqsave(&midi->open_lock, flags);
-       snd_emu10k1x_intr_disable(emu, midi->rx_enable);
-       midi->midi_mode &= ~EMU10K1X_MIDI_MODE_INPUT;
-       midi->substream_input = NULL;
-       if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
-               err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
-       } else {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
+       scoped_guard(spinlock_irqsave, &midi->open_lock) {
+               snd_emu10k1x_intr_disable(emu, midi->rx_enable);
+               midi->midi_mode &= ~EMU10K1X_MIDI_MODE_INPUT;
+               midi->substream_input = NULL;
+               if (midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)
+                       return 0;
        }
-       return err;
+       return snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
 }
 
 static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substream)
 {
        struct emu10k1x *emu;
        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-       unsigned long flags;
-       int err = 0;
 
        emu = midi->emu;
        if (snd_BUG_ON(!emu))
                return -ENXIO;
-       spin_lock_irqsave(&midi->open_lock, flags);
-       snd_emu10k1x_intr_disable(emu, midi->tx_enable);
-       midi->midi_mode &= ~EMU10K1X_MIDI_MODE_OUTPUT;
-       midi->substream_output = NULL;
-       if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
-               err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
-       } else {
-               spin_unlock_irqrestore(&midi->open_lock, flags);
+       scoped_guard(spinlock_irqsave, &midi->open_lock) {
+               snd_emu10k1x_intr_disable(emu, midi->tx_enable);
+               midi->midi_mode &= ~EMU10K1X_MIDI_MODE_OUTPUT;
+               midi->substream_output = NULL;
+               if (midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)
+                       return 0;
        }
-       return err;
+       return snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
 }
 
 static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
@@ -1390,7 +1347,6 @@ static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *subst
 {
        struct emu10k1x *emu;
        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-       unsigned long flags;
 
        emu = midi->emu;
        if (snd_BUG_ON(!emu))
@@ -1401,22 +1357,21 @@ static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *subst
                unsigned char byte;
        
                /* try to send some amount of bytes here before interrupts */
-               spin_lock_irqsave(&midi->output_lock, flags);
-               while (max > 0) {
-                       if (mpu401_output_ready(emu, midi)) {
-                               if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT) ||
-                                   snd_rawmidi_transmit(substream, &byte, 1) != 1) {
-                                       /* no more data */
-                                       spin_unlock_irqrestore(&midi->output_lock, flags);
-                                       return;
+               scoped_guard(spinlock_irqsave, &midi->output_lock) {
+                       while (max > 0) {
+                               if (mpu401_output_ready(emu, midi)) {
+                                       if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT) ||
+                                           snd_rawmidi_transmit(substream, &byte, 1) != 1) {
+                                               /* no more data */
+                                               return;
+                                       }
+                                       mpu401_write_data(emu, midi, byte);
+                                       max--;
+                               } else {
+                                       break;
                                }
-                               mpu401_write_data(emu, midi, byte);
-                               max--;
-                       } else {
-                               break;
                        }
                }
-               spin_unlock_irqrestore(&midi->output_lock, flags);
                snd_emu10k1x_intr_enable(emu, midi->tx_enable);
        } else {
                snd_emu10k1x_intr_disable(emu, midi->tx_enable);