sound: use DEFINE_PCI_DEVICE_TABLE

[safe/jmp/linux-2.6] / sound / pci / cs5535audio / cs5535audio.c

diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 91c18a1..afb8037 100644 (file)
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
@@ -67,7 +66,7 @@ MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME);
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME);
 
-static struct pci_device_id snd_cs5535audio_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs5535audio_ids) = {
        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) },
        {}
@@ -145,7 +144,7 @@ static unsigned short snd_cs5535audio_ac97_codec_read(struct snd_ac97 *ac97,
        return snd_cs5535audio_codec_read(cs5535au, reg);
 }
 
-static int snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
+static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
 {
        struct snd_card *card = cs5535au->card;
        struct snd_ac97_bus *pbus;
@@ -160,10 +159,14 @@ static int snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
                return err;
 
        memset(&ac97, 0, sizeof(ac97));
-       ac97.scaps = AC97_SCAP_AUDIO|AC97_SCAP_SKIP_MODEM;
+       ac97.scaps = AC97_SCAP_AUDIO | AC97_SCAP_SKIP_MODEM
+                       | AC97_SCAP_POWER_SAVE;
        ac97.private_data = cs5535au;
        ac97.pci = cs5535au->pci;
 
+       /* set any OLPC-specific scaps */
+       olpc_prequirks(card, &ac97);
+
        if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {
                snd_printk(KERN_ERR "mixer failed\n");
                return err;
@@ -171,6 +174,12 @@ static int snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
 
        snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);
 
+       err = olpc_quirks(card, cs5535au->ac97);
+       if (err < 0) {
+               snd_printk(KERN_ERR "olpc quirks failed\n");
+               return err;
+       }
+
        return 0;
 }
 
@@ -203,11 +212,9 @@ static void process_bm1_irq(struct cs5535audio *cs5535au)
        }
 }
 
-static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id,
-                                            struct pt_regs *regs)
+static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)
 {
        u16 acc_irq_stat;
-       u8 bm_stat;
        unsigned char count;
        struct cs5535audio *cs5535au = dev_id;
 
@@ -218,7 +225,7 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id,
 
        if (!acc_irq_stat)
                return IRQ_NONE;
-       for (count = 0; count < 10; count++) {
+       for (count = 0; count < 4; count++) {
                if (acc_irq_stat & (1 << count)) {
                        switch (count) {
                        case IRQ_STS:
@@ -233,26 +240,9 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id,
                        case BM1_IRQ_STS:
                                process_bm1_irq(cs5535au);
                                break;
-                       case BM2_IRQ_STS:
-                               bm_stat = cs_readb(cs5535au, ACC_BM2_STATUS);
-                               break;
-                       case BM3_IRQ_STS:
-                               bm_stat = cs_readb(cs5535au, ACC_BM3_STATUS);
-                               break;
-                       case BM4_IRQ_STS:
-                               bm_stat = cs_readb(cs5535au, ACC_BM4_STATUS);
-                               break;
-                       case BM5_IRQ_STS:
-                               bm_stat = cs_readb(cs5535au, ACC_BM5_STATUS);
-                               break;
-                       case BM6_IRQ_STS:
-                               bm_stat = cs_readb(cs5535au, ACC_BM6_STATUS);
-                               break;
-                       case BM7_IRQ_STS:
-                               bm_stat = cs_readb(cs5535au, ACC_BM7_STATUS);
-                               break;
                        default:
-                               snd_printk(KERN_ERR "Unexpected irq src\n");
+                               snd_printk(KERN_ERR "Unexpected irq src: "
+                                               "0x%x\n", acc_irq_stat);
                                break;
                        }
                }
@@ -295,8 +285,8 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
 
-       if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
+       if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
+           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
                printk(KERN_WARNING "unable to get 32bit dma\n");
                err = -ENXIO;
                goto pcifail;
@@ -321,8 +311,8 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
        cs5535au->port = pci_resource_start(pci, 0);
 
        if (request_irq(pci->irq, snd_cs5535audio_interrupt,
-                       SA_INTERRUPT|SA_SHIRQ, "CS5535 Audio", cs5535au)) {
-               snd_printk("unable to grab IRQ %d\n", pci->irq);
+                       IRQF_SHARED, "CS5535 Audio", cs5535au)) {
+               snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                err = -EBUSY;
                goto sndfail;
        }
@@ -363,9 +353,9 @@ static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,
                return -ENOENT;
        }
 
-       card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-       if (card == NULL)
-               return -ENOMEM;
+       err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+       if (err < 0)
+               return err;
 
        if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
                goto probefail_out;
@@ -399,6 +389,7 @@ probefail_out:
 
 static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
 {
+       olpc_quirks_cleanup();
        snd_card_free(pci_get_drvdata(pci));
        pci_set_drvdata(pci, NULL);
 }