[ALSA] oxygen: use AC97 interrupt

After an AC97 register read or write, use the AC97 interrupt instead of
polling to wait for the access to be completed.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 10 insertions, 3 deletions

diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index d98867c1f2d4..de6bf41c3e96 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -53,7 +53,8 @@ static irqreturn_t oxygen_interrupt(int dummy, void *dev_id)
                           OXYGEN_CHANNEL_MULTICH |
                           OXYGEN_CHANNEL_AC97 |
                           OXYGEN_INT_SPDIF_IN_DETECT |
-                          OXYGEN_INT_GPIO);
+                          OXYGEN_INT_GPIO |
+                          OXYGEN_INT_AC97);
         if (clear) {
                 if (clear & OXYGEN_INT_SPDIF_IN_DETECT)
                         chip->interrupt_mask &= ~OXYGEN_INT_SPDIF_IN_DETECT;
@@ -89,6 +90,9 @@ static irqreturn_t oxygen_interrupt(int dummy, void *dev_id)
         if ((status & OXYGEN_INT_MIDI) && chip->midi)
                 snd_mpu401_uart_interrupt(0, chip->midi->private_data);
 
+        if (status & OXYGEN_INT_AC97)
+                wake_up(&chip->ac97_waitqueue);
+
         return IRQ_HANDLED;
 }
 
@@ -306,7 +310,9 @@ static void __devinit oxygen_init(struct oxygen *chip)
                       (2 << OXYGEN_A_MONITOR_ROUTE_2_SHIFT) |
                       (3 << OXYGEN_A_MONITOR_ROUTE_3_SHIFT));
 
-        oxygen_write8(chip, OXYGEN_AC97_INTERRUPT_MASK, 0);
+        oxygen_write8(chip, OXYGEN_AC97_INTERRUPT_MASK,
+                      OXYGEN_AC97_INT_READ_DONE |
+                      OXYGEN_AC97_INT_WRITE_DONE);
         oxygen_write32(chip, OXYGEN_AC97_OUT_CONFIG, 0);
         oxygen_write32(chip, OXYGEN_AC97_IN_CONFIG, 0);
         if (!(chip->has_ac97_0 | chip->has_ac97_1))
@@ -408,6 +414,7 @@ int __devinit oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         mutex_init(&chip->mutex);
         INIT_WORK(&chip->spdif_input_bits_work,
                   oxygen_spdif_input_bits_changed);
+        init_waitqueue_head(&chip->ac97_waitqueue);
 
         err = pci_enable_device(pci);
         if (err < 0)
@@ -471,7 +478,7 @@ int __devinit oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         oxygen_proc_init(chip);
 
         spin_lock_irq(&chip->reg_lock);
-        chip->interrupt_mask |= OXYGEN_INT_SPDIF_IN_DETECT;
+        chip->interrupt_mask |= OXYGEN_INT_SPDIF_IN_DETECT | OXYGEN_INT_AC97;
         oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, chip->interrupt_mask);
         spin_unlock_irq(&chip->reg_lock);