Changeset 772 for GPL/trunk/alsa-kernel/pci/emu10k1/emumpu401.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emumpu401.c (modified) (14 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emumpu401.c

@@ -105 +105 @@
 static int snd_emu10k1_midi_cmd(struct snd_emu10k1 * emu, struct snd_emu10k1_midi *midi, unsigned char cmd, int ack)
 {
-        unsigned long flags;
         int timeout, ok;
 
-        spin_lock_irqsave(&midi->input_lock, flags);
+        spin_lock_irq(&midi->input_lock);
         mpu401_write_data(emu, midi, 0x00);
         /* mpu401_clear_rx(emu, midi); */
@@ -127 +126 @@
                 ok = 1;
         }
-        spin_unlock_irqrestore(&midi->input_lock, flags);
+        spin_unlock_irq(&midi->input_lock);
         if (!ok) {
                 dev_err(emu->card->dev,
@@ -143 +142 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_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);
+        spin_lock_irq(&midi->open_lock);
         midi->midi_mode |= EMU10K1_MIDI_MODE_INPUT;
         midi->substream_input = substream;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
                         goto error_out;
@@ -158 +156 @@
                         goto error_out;
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return 0;
@@ -170 +168 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_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);
+        spin_lock_irq(&midi->open_lock);
         midi->midi_mode |= EMU10K1_MIDI_MODE_OUTPUT;
         midi->substream_output = substream;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
                         goto error_out;
@@ -185 +182 @@
                         goto error_out;
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return 0;
@@ -197 +194 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
         int err = 0;
 
@@ -203 +199 @@
         if (snd_BUG_ON(!emu))
                 return -ENXIO;
-        spin_lock_irqsave(&midi->open_lock, flags);
+        spin_lock_irq(&midi->open_lock);
         snd_emu10k1_intr_disable(emu, midi->rx_enable);
         midi->midi_mode &= ~EMU10K1_MIDI_MODE_INPUT;
         midi->substream_input = NULL;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return err;
@@ -220 +216 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
         int err = 0;
 
@@ -226 +221 @@
         if (snd_BUG_ON(!emu))
                 return -ENXIO;
-        spin_lock_irqsave(&midi->open_lock, flags);
+        spin_lock_irq(&midi->open_lock);
         snd_emu10k1_intr_disable(emu, midi->tx_enable);
         midi->midi_mode &= ~EMU10K1_MIDI_MODE_OUTPUT;
         midi->substream_output = NULL;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return err;
@@ -257 +252 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
 
         emu = midi->emu;
@@ -268 +262 @@
         
                 /* try to send some amount of bytes here before interrupts */
-                spin_lock_irqsave(&midi->output_lock, flags);
+                spin_lock_irq(&midi->output_lock);
                 while (max > 0) {
                         if (mpu401_output_ready(emu, midi)) {
@@ -274 +268 @@
                                     snd_rawmidi_transmit(substream, &byte, 1) != 1) {
                                         /* no more data */
-                                        spin_unlock_irqrestore(&midi->output_lock, flags);
+                                        spin_unlock_irq(&midi->output_lock);
                                         return;
                                 }
@@ -283 +277 @@
                         }
                 }
-                spin_unlock_irqrestore(&midi->output_lock, flags);
+                spin_unlock_irq(&midi->output_lock);
                 snd_emu10k1_intr_enable(emu, midi->tx_enable);
         } else {