Changeset 305 for GPL/branches/uniaud-2.0/alsa-kernel/pci/ens1370.c

Timestamp:

Mar 24, 2008, 2:43:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.16 level

File:

• GPL/branches/uniaud-2.0/alsa-kernel/pci/ens1370.c (modified) (45 diffs)

GPL/branches/uniaud-2.0/alsa-kernel/pci/ens1370.c

@@ -1 +1 @@
 /*
  *  Driver for Ensoniq ES1370/ES1371 AudioPCI soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Thomas Sailer <sailer@ife.ee.ethz.ch>
  *
@@ -27 +27 @@
  */
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
@@ -34 +33 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-//#include <linux/gameport.h>
+#include <linux/gameport.h>
 #include <linux/moduleparam.h>
+#include <linux/mutex.h>
+
 #include <sound/core.h>
 #include <sound/control.h>
@@ -48 +49 @@
 #include <sound/asoundef.h>
 
-#ifndef PCI_DEVICE_ID_ENSONIQ_CT5880
-#define PCI_DEVICE_ID_ENSONIQ_CT5880    0x5880
-#endif
-
 #ifndef CHIP1371
 #undef CHIP1370
@@ -64 +61 @@
 
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Thomas Sailer <sailer@ife.ee.ethz.ch>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Thomas Sailer <sailer@ife.ee.ethz.ch>");
 MODULE_LICENSE("GPL");
 #ifdef CHIP1370
@@ -100 +97 @@
 #endif
 
-//module_param_array(index, int, NULL, 0444);
+module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Ensoniq AudioPCI soundcard.");
-//module_param_array(id, charp, NULL, 0444);
+module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for Ensoniq AudioPCI soundcard.");
-//module_param_array(enable, bool, NULL, 0444);
+module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Ensoniq AudioPCI soundcard.");
 #ifdef SUPPORT_JOYSTICK
 #ifdef CHIP1371
-//module_param_array(joystick_port, int, NULL, 0444);
+module_param_array(joystick_port, int, NULL, 0444);
 MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #else
-//module_param_array(joystick, bool, NULL, 0444);
+module_param_array(joystick, bool, NULL, 0444);
 MODULE_PARM_DESC(joystick, "Enable joystick.");
 #endif
 #endif /* SUPPORT_JOYSTICK */
 #ifdef CHIP1371
-//module_param_array(spdif, int, NULL, 0444);
+module_param_array(spdif, int, NULL, 0444);
 MODULE_PARM_DESC(spdif, "S/PDIF output (-1 = none, 0 = auto, 1 = force).");
-//module_param_array(lineio, int, NULL, 0444);
+module_param_array(lineio, int, NULL, 0444);
 MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force).");
 #endif
@@ -384 +381 @@
 struct ensoniq {
         spinlock_t reg_lock;
-        struct semaphore src_mutex;
+        struct mutex src_mutex;
 
         int irq;
@@ -416 +413 @@
 
         struct pci_dev *pci;
-        unsigned short subsystem_vendor_id;
-        unsigned short subsystem_device_id;
         struct snd_card *card;
         struct snd_pcm *pcm1;   /* DAC1/ADC PCM */
@@ -447 +442 @@
 };
 
-static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id);
 
 static struct pci_device_id snd_audiopci_ids[] = {
@@ -614 +609 @@
         unsigned int t, x;
 
-        down(&ensoniq->src_mutex);
+        mutex_lock(&ensoniq->src_mutex);
         for (t = 0; t < POLL_COUNT; t++) {
                 if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) {
@@ -639 +634 @@
                         snd_es1371_wait_src_ready(ensoniq);
                         outl(x, ES_REG(ensoniq, 1371_SMPRATE));
-                        up(&ensoniq->src_mutex);
+                        mutex_unlock(&ensoniq->src_mutex);
                         return;
                 }
         }
-        up(&ensoniq->src_mutex);
+        mutex_unlock(&ensoniq->src_mutex);
         snd_printk(KERN_ERR "codec write timeout at 0x%lx [0x%x]\n",
                    ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
@@ -655 +650 @@
 
       __again:
-        down(&ensoniq->src_mutex);
+        mutex_lock(&ensoniq->src_mutex);
         for (t = 0; t < POLL_COUNT; t++) {
                 if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) {
@@ -688 +683 @@
                         for (t = 0; t < POLL_COUNT; t++) {
                                 if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) & ES_1371_CODEC_RDY) {
-                                        up(&ensoniq->src_mutex);
+                                        mutex_unlock(&ensoniq->src_mutex);
                                         return ES_1371_CODEC_READ(x);
                                 }
                         }
-                        up(&ensoniq->src_mutex);
+                        mutex_unlock(&ensoniq->src_mutex);
                         if (++fail > 10) {
                                 snd_printk(KERN_ERR "codec read timeout (final) "
@@ -703 +698 @@
                 }
         }
-        up(&ensoniq->src_mutex);
+        mutex_unlock(&ensoniq->src_mutex);
         snd_printk(KERN_ERR "es1371: codec read timeout at 0x%lx [0x%x]\n",
                    ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
@@ -722 +717 @@
         unsigned int n, truncm, freq, result;
 
-        down(&ensoniq->src_mutex);
+        mutex_lock(&ensoniq->src_mutex);
         n = rate / 3000;
         if ((1 << n) & ((1 << 15) | (1 << 13) | (1 << 11) | (1 << 9)))
@@ -747 +742 @@
         snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC, n << 8);
         snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC + 1, n << 8);
-        up(&ensoniq->src_mutex);
+        mutex_unlock(&ensoniq->src_mutex);
 }
 
@@ -754 +749 @@
         unsigned int freq, r;
 
-        down(&ensoniq->src_mutex);
+        mutex_lock(&ensoniq->src_mutex);
         freq = ((rate << 15) + 1500) / 3000;
         r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
@@ -768 +763 @@
                                                    ES_1371_DIS_P2 | ES_1371_DIS_R1));
         outl(r, ES_REG(ensoniq, 1371_SMPRATE));
-        up(&ensoniq->src_mutex);
+        mutex_unlock(&ensoniq->src_mutex);
 }
 
@@ -775 +770 @@
         unsigned int freq, r;
 
-        down(&ensoniq->src_mutex);
+        mutex_lock(&ensoniq->src_mutex);
         freq = ((rate << 15) + 1500) / 3000;
         r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
@@ -790 +785 @@
                                                    ES_1371_DIS_P1 | ES_1371_DIS_R1));
         outl(r, ES_REG(ensoniq, 1371_SMPRATE));
-        up(&ensoniq->src_mutex);
+        mutex_unlock(&ensoniq->src_mutex);
 }
 
@@ -803 +798 @@
         {
                 unsigned int what = 0;
-                struct list_head *pos;
                 struct snd_pcm_substream *s;
-                snd_pcm_group_for_each(pos, substream) {
-                        s = snd_pcm_group_substream_entry(pos);
+                snd_pcm_group_for_each_entry(s, substream) {
                         if (s == ensoniq->playback1_substream) {
                                 what |= ES_P1_PAUSE;
@@ -829 +822 @@
         {
                 unsigned int what = 0;
-                struct list_head *pos;
                 struct snd_pcm_substream *s;
-                snd_pcm_group_for_each(pos, substream) {
-                        s = snd_pcm_group_substream_entry(pos);
+                snd_pcm_group_for_each_entry(s, substream) {
                         if (s == ensoniq->playback1_substream) {
                                 what |= ES_DAC1_EN;
@@ -1134 +1125 @@
                                    &snd_es1370_hw_constraints_rates);
 #else
-//      snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-//                                    &snd_es1371_hw_constraints_dac_clock);
+        snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                      &snd_es1371_hw_constraints_dac_clock);
 #endif
         return 0;
@@ -1157 +1148 @@
                                       &snd_es1370_hw_constraints_clock);
 #else
-//      snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-//                                    &snd_es1371_hw_constraints_dac_clock);
+        snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                      &snd_es1371_hw_constraints_dac_clock);
 #endif
         return 0;
@@ -1428 +1419 @@
   .get = snd_es1371_spdif_get, .put = snd_es1371_spdif_put }
 
-static int snd_es1371_spdif_info(struct snd_kcontrol *kcontrol,
-                                 struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1371_spdif_info           snd_ctl_boolean_mono_info
 
 static int snd_es1371_spdif_get(struct snd_kcontrol *kcontrol,
@@ -1498 +1481 @@
 
 
-static int snd_es1373_rear_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1373_rear_info            snd_ctl_boolean_mono_info
 
 static int snd_es1373_rear_get(struct snd_kcontrol *kcontrol,
@@ -1551 +1526 @@
 };
 
-static int snd_es1373_line_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1373_line_info            snd_ctl_boolean_mono_info
 
 static int snd_es1373_line_get(struct snd_kcontrol *kcontrol,
@@ -1610 +1577 @@
 }
 
-static struct {
+struct es1371_quirk {
         unsigned short vid;             /* vendor ID */
         unsigned short did;             /* device ID */
         unsigned char rev;              /* revision */
-} es1371_spdif_present[] __devinitdata = {
+};
+
+static int es1371_quirk_lookup(struct ensoniq *ensoniq,
+                                struct es1371_quirk *list)
+{
+        while (list->vid != (unsigned short)PCI_ANY_ID) {
+                if (ensoniq->pci->vendor == list->vid &&
+                    ensoniq->pci->device == list->did &&
+                    ensoniq->rev == list->rev)
+                        return 1;
+                list++;
+        }
+        return 0;
+}
+
+static struct es1371_quirk es1371_spdif_present[] __devinitdata = {
         { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_C },
         { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_D },
@@ -1623 +1605 @@
 };
 
-static int snd_ensoniq_1371_mixer(struct ensoniq * ensoniq, int has_spdif, int has_line)
+static struct snd_pci_quirk ens1373_line_quirk[] __devinitdata = {
+        SND_PCI_QUIRK_ID(0x1274, 0x2000), /* GA-7DXR */
+        SND_PCI_QUIRK_ID(0x1458, 0xa000), /* GA-8IEXP */
+        {0} /* end */
+};
+
+static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,
+                                            int has_spdif, int has_line)
 {
         struct snd_card *card = ensoniq->card;
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
-        int err, idx;
+        int err;
         static struct snd_ac97_bus_ops ops = {
                 .write = snd_es1371_codec_write,
@@ -1644 +1633 @@
         if ((err = snd_ac97_mixer(pbus, &ac97, &ensoniq->u.es1371.ac97)) < 0)
                 return err;
-        for (idx = 0; es1371_spdif_present[idx].vid != (unsigned short)PCI_ANY_ID; idx++)
-                if ((ensoniq->pci->vendor == es1371_spdif_present[idx].vid &&
-                     ensoniq->pci->device == es1371_spdif_present[idx].did &&
-                     ensoniq->rev == es1371_spdif_present[idx].rev) || has_spdif > 0) {
-                        struct snd_kcontrol *kctl;
-                        int i, index = 0; 
-
-                        if (has_spdif < 0)
-                                break;
-
-                        ensoniq->spdif_default = ensoniq->spdif_stream =
-                                SNDRV_PCM_DEFAULT_CON_SPDIF;
-                        outl(ensoniq->spdif_default, ES_REG(ensoniq, CHANNEL_STATUS));
-
-                        if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SPDIF)
-                                index++;
-
-                        for (i = 0; i < (int)ARRAY_SIZE(snd_es1371_mixer_spdif); i++) {
-                                kctl = snd_ctl_new1(&snd_es1371_mixer_spdif[i], ensoniq);
-                                if (! kctl)
-                                        return -ENOMEM;
-                                kctl->id.index = index;
-                                if ((err = snd_ctl_add(card, kctl)) < 0)
-                                        return err;
-                        }
-                        break;
+        if (has_spdif > 0 ||
+            (!has_spdif && es1371_quirk_lookup(ensoniq, es1371_spdif_present))) {
+                struct snd_kcontrol *kctl;
+                int i, index = 0;
+
+                ensoniq->spdif_default = ensoniq->spdif_stream =
+                        SNDRV_PCM_DEFAULT_CON_SPDIF;
+                outl(ensoniq->spdif_default, ES_REG(ensoniq, CHANNEL_STATUS));
+
+                if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SPDIF)
+                        index++;
+
+                for (i = 0; i < ARRAY_SIZE(snd_es1371_mixer_spdif); i++) {
+                        kctl = snd_ctl_new1(&snd_es1371_mixer_spdif[i], ensoniq);
+                        if (!kctl)
+                                return -ENOMEM;
+                        kctl->id.index = index;
+                        err = snd_ctl_add(card, kctl);
+                        if (err < 0)
+                                return err;
                 }
+        }
         if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SDAC) {
                 /* mirror rear to front speakers */
@@ -1679 +1663 @@
                         return err;
         }
-        if (((ensoniq->subsystem_vendor_id == 0x1274) &&
-            (ensoniq->subsystem_device_id == 0x2000)) || /* GA-7DXR */
-            ((ensoniq->subsystem_vendor_id == 0x1458) &&
-            (ensoniq->subsystem_device_id == 0xa000)) || /* GA-8IEXP */
-            has_line > 0) {
-                 err = snd_ctl_add(card, snd_ctl_new1(&snd_ens1373_line, ensoniq));
+        if (has_line > 0 ||
+            snd_pci_quirk_lookup(ensoniq->pci, ens1373_line_quirk)) {
+                 err = snd_ctl_add(card, snd_ctl_new1(&snd_ens1373_line,
+                                                      ensoniq));
                  if (err < 0)
                          return err;
@@ -1701 +1683 @@
   .private_value = mask }
 
-static int snd_ensoniq_control_info(struct snd_kcontrol *kcontrol,
-                                    struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ensoniq_control_info        snd_ctl_boolean_mono_info
 
 static int snd_ensoniq_control_get(struct snd_kcontrol *kcontrol,
@@ -1918 +1892 @@
 
         if (! snd_card_proc_new(ensoniq->card, "audiopci", &entry))
-                snd_info_set_text_ops(entry, ensoniq, 1024, snd_ensoniq_proc_read);
+                snd_info_set_text_ops(entry, ensoniq, snd_ensoniq_proc_read);
 }
 
@@ -1959 +1933 @@
 
 #ifdef CHIP1371
-static struct {
-        unsigned short svid;            /* subsystem vendor ID */
-        unsigned short sdid;            /* subsystem device ID */
-} es1371_amplifier_hack[] = {
-        { .svid = 0x107b, .sdid = 0x2150 },     /* Gateway Solo 2150 */
-        { .svid = 0x13bd, .sdid = 0x100c },     /* EV1938 on Mebius PC-MJ100V */
-        { .svid = 0x1102, .sdid = 0x5938 },     /* Targa Xtender300 */
-        { .svid = 0x1102, .sdid = 0x8938 },     /* IPC Topnote G notebook */
-        { .svid = PCI_ANY_ID, .sdid = PCI_ANY_ID }
-};
-static struct {
-        unsigned short vid;             /* vendor ID */
-        unsigned short did;             /* device ID */
-        unsigned char rev;              /* revision */
-} es1371_ac97_reset_hack[] = {
+static struct snd_pci_quirk es1371_amplifier_hack[] __devinitdata = {
+        SND_PCI_QUIRK_ID(0x107b, 0x2150),       /* Gateway Solo 2150 */
+        SND_PCI_QUIRK_ID(0x13bd, 0x100c),       /* EV1938 on Mebius PC-MJ100V */
+        SND_PCI_QUIRK_ID(0x1102, 0x5938),       /* Targa Xtender300 */
+        SND_PCI_QUIRK_ID(0x1102, 0x8938),       /* IPC Topnote G notebook */
+        {0} /* end */
+};
+
+static struct es1371_quirk es1371_ac97_reset_hack[] = {
         { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_C },
         { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_D },
@@ -1987 +1955 @@
 #ifdef CHIP1371
         int idx;
-        struct pci_dev *pci = ensoniq->pci;
 #endif
         /* this code was part of snd_ensoniq_create before intruduction
@@ -2002 +1969 @@
         outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
         outl(0, ES_REG(ensoniq, 1371_LEGACY));
-        for (idx = 0; es1371_ac97_reset_hack[idx].vid != (unsigned short)PCI_ANY_ID; idx++)
-                if (pci->vendor == es1371_ac97_reset_hack[idx].vid &&
-                    pci->device == es1371_ac97_reset_hack[idx].did &&
-                    ensoniq->rev == es1371_ac97_reset_hack[idx].rev) {
-                        outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
-                        /* need to delay around 20ms(bleech) to give
-                        some CODECs enough time to wakeup */
-                        msleep(20);
-                        break;
-                }
+        if (es1371_quirk_lookup(ensoniq, es1371_ac97_reset_hack)) {
+            outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
+            /* need to delay around 20ms(bleech) to give
+               some CODECs enough time to wakeup */
+            msleep(20);
+        }
         /* AC'97 warm reset to start the bitclk */
         outl(ensoniq->ctrl | ES_1371_SYNC_RES, ES_REG(ensoniq, CONTROL));
@@ -2075 +2038 @@
         snd_ak4531_suspend(ensoniq->u.es1370.ak4531);
 #endif  
-        pci_set_power_state(pci, PCI_D3hot);
+
         pci_disable_device(pci);
         pci_save_state(pci);
+        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
@@ -2086 +2050 @@
         struct ensoniq *ensoniq = card->private_data;
 
+        pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
-        pci_enable_device(pci);
-        pci_set_power_state(pci, PCI_D0);
+        if (pci_enable_device(pci) < 0) {
+                printk(KERN_ERR DRIVER_NAME ": pci_enable_device failed, "
+                       "disabling device\n");
+                snd_card_disconnect(card);
+                return -EIO;
+        }
         pci_set_master(pci);
 
@@ -2109 +2078 @@
 {
         struct ensoniq *ensoniq;
-        unsigned short cmdw;
-        unsigned char cmdb;
-#ifdef CHIP1371
-        int idx;
-#endif
         int err;
         static struct snd_device_ops ops = {
@@ -2128 +2092 @@
         }
         spin_lock_init(&ensoniq->reg_lock);
-        init_MUTEX(&ensoniq->src_mutex);
+        mutex_init(&ensoniq->src_mutex);
         ensoniq->card = card;
         ensoniq->pci = pci;
@@ -2138 +2102 @@
         }
         ensoniq->port = pci_resource_start(pci, 0);
-        if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ,
+        if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
                         "Ensoniq AudioPCI", ensoniq)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
@@ -2154 +2118 @@
 #endif
         pci_set_master(pci);
-        pci_read_config_byte(pci, PCI_REVISION_ID, &cmdb);
-        ensoniq->rev = cmdb;
-        pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &cmdw);
-        ensoniq->subsystem_vendor_id = cmdw;
-        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &cmdw);
-        ensoniq->subsystem_device_id = cmdw;
+#ifndef TARGET_OS2
+        ensoniq->rev = pci->revision;
+#else
+        ensoniq->rev = snd_pci_revision(pci);
+#endif
 #ifdef CHIP1370
 #if 0
@@ -2172 +2135 @@
         ensoniq->sctrl = 0;
         ensoniq->cssr = 0;
-        for (idx = 0; es1371_amplifier_hack[idx].svid != (unsigned short)PCI_ANY_ID; idx++)
-                if (ensoniq->subsystem_vendor_id == es1371_amplifier_hack[idx].svid &&
-                    ensoniq->subsystem_device_id == es1371_amplifier_hack[idx].sdid) {
-                        ensoniq->ctrl |= ES_1371_GPIO_OUT(1);   /* turn amplifier on */
-                        break;
-                }
-        for (idx = 0; es1371_ac97_reset_hack[idx].vid != (unsigned short)PCI_ANY_ID; idx++)
-                if (pci->vendor == es1371_ac97_reset_hack[idx].vid &&
-                    pci->device == es1371_ac97_reset_hack[idx].did &&
-                    ensoniq->rev == es1371_ac97_reset_hack[idx].rev) {
-                        ensoniq->cssr |= ES_1371_ST_AC97_RST;
-                        break;
-                }
+        if (snd_pci_quirk_lookup(pci, es1371_amplifier_hack))
+                ensoniq->ctrl |= ES_1371_GPIO_OUT(1);   /* turn amplifier on */
+
+        if (es1371_quirk_lookup(ensoniq, es1371_ac97_reset_hack))
+                ensoniq->cssr |= ES_1371_ST_AC97_RST;
 #endif
 
@@ -2407 +2362 @@
  */
 
-static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id)
 {
         struct ensoniq *ensoniq = dev_id;
@@ -2524 +2479 @@
         .id_table = snd_audiopci_ids,
         .probe = snd_audiopci_probe,
-        .remove = snd_audiopci_remove,
+        .remove = __devexit_p(snd_audiopci_remove),
 #ifdef CONFIG_PM
         .suspend = snd_ensoniq_suspend,