[ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz
[linux-2.6.git] / sound / isa / gus / gusmax.c
index 63311cd..4922f5d 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Driver for Gravis UltraSound MAX soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
  */
 
 #include <sound/driver.h>
-#include <asm/dma.h>
 #include <linux/init.h>
+#include <linux/err.h>
+#include <linux/isa.h>
 #include <linux/delay.h>
 #include <linux/time.h>
 #include <linux/moduleparam.h>
+#include <asm/dma.h>
 #include <sound/core.h>
 #include <sound/gus.h>
 #include <sound/cs4231.h>
-#define SNDRV_LEGACY_AUTO_PROBE
 #define SNDRV_LEGACY_FIND_FREE_IRQ
 #define SNDRV_LEGACY_FIND_FREE_DMA
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Gravis UltraSound MAX");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound MAX}}");
@@ -80,11 +81,9 @@ struct snd_gusmax {
        unsigned short pcm_status_reg;
 };
 
-static struct snd_card *snd_gusmax_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-
 #define PFX    "gusmax: "
 
-static int __init snd_gusmax_detect(struct snd_gus_card * gus)
+static int __devinit snd_gusmax_detect(struct snd_gus_card * gus)
 {
        unsigned char d;
 
@@ -104,9 +103,9 @@ static int __init snd_gusmax_detect(struct snd_gus_card * gus)
        return 0;
 }
 
-static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
 {
-       struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id;
+       struct snd_gusmax *maxcard = dev_id;
        int loop, max = 5;
        int handled = 0;
 
@@ -114,19 +113,20 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id, struct pt_regs *r
                loop = 0;
                if (inb(maxcard->gus_status_reg)) {
                        handled = 1;
-                       snd_gus_interrupt(irq, maxcard->gus, regs);
+                       snd_gus_interrupt(irq, maxcard->gus);
                        loop++;
                }
                if (inb(maxcard->pcm_status_reg) & 0x01) { /* IRQ bit is set? */
                        handled = 1;
-                       snd_cs4231_interrupt(irq, maxcard->cs4231, regs);
+                       snd_cs4231_interrupt(irq, maxcard->cs4231);
                        loop++;
                }
        } while (loop && --max > 0);
        return IRQ_RETVAL(handled);
 }
 
-static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gus_card * gus)
+static void __devinit snd_gusmax_init(int dev, struct snd_card *card,
+                                     struct snd_gus_card * gus)
 {
        gus->equal_irq = 1;
        gus->codec_flag = 1;
@@ -144,7 +144,7 @@ static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gu
 #define CS4231_PRIVATE( left, right, shift, mute ) \
                        ((left << 24)|(right << 16)|(shift<<8)|mute)
 
-static int __init snd_gusmax_mixer(struct snd_cs4231 *chip)
+static int __devinit snd_gusmax_mixer(struct snd_cs4231 *chip)
 {
        struct snd_card *card = chip->card;
        struct snd_ctl_elem_id id1, id2;
@@ -203,7 +203,12 @@ static void snd_gusmax_free(struct snd_card *card)
                free_irq(maxcard->irq, (void *)maxcard);
 }
 
-static int __init snd_gusmax_probe(int dev)
+static int __devinit snd_gusmax_match(struct device *pdev, unsigned int dev)
+{
+       return enable[dev];
+}
+
+static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
 {
        static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
        static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
@@ -247,12 +252,32 @@ static int __init snd_gusmax_probe(int dev)
                }
        }
 
-       if ((err = snd_gus_create(card,
-                                 port[dev],
-                                 -xirq, xdma1, xdma2,
-                                 0, channels[dev],
-                                 pcm_channels[dev],
-                                 0, &gus)) < 0)
+       if (port[dev] != SNDRV_AUTO_PORT) {
+               err = snd_gus_create(card,
+                                    port[dev],
+                                    -xirq, xdma1, xdma2,
+                                    0, channels[dev],
+                                    pcm_channels[dev],
+                                    0, &gus);
+       } else {
+               static unsigned long possible_ports[] = {
+                       0x220, 0x230, 0x240, 0x250, 0x260
+               };
+               int i;
+               for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
+                       err = snd_gus_create(card,
+                                            possible_ports[i],
+                                            -xirq, xdma1, xdma2,
+                                            0, channels[dev],
+                                            pcm_channels[dev],
+                                            0, &gus);
+                       if (err >= 0) {
+                               port[dev] = possible_ports[i];
+                               break;
+                       }
+               }
+       }
+       if (err < 0)
                goto _err;
 
        if ((err = snd_gusmax_detect(gus)) < 0)
@@ -270,7 +295,7 @@ static int __init snd_gusmax_probe(int dev)
                goto _err;
        }
 
-       if (request_irq(xirq, snd_gusmax_interrupt, SA_INTERRUPT, "GUS MAX", (void *)maxcard)) {
+       if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) {
                snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
                err = -EBUSY;
                goto _err;
@@ -310,15 +335,15 @@ static int __init snd_gusmax_probe(int dev)
        if (xdma2 >= 0)
                sprintf(card->longname + strlen(card->longname), "&%i", xdma2);
 
-       if ((err = snd_card_set_generic_dev(card)) < 0)
-               goto _err;
+       snd_card_set_dev(card, pdev);
 
        if ((err = snd_card_register(card)) < 0)
                goto _err;
                
        maxcard->gus = gus;
        maxcard->cs4231 = cs4231;
-       snd_gusmax_cards[dev] = card;
+
+       dev_set_drvdata(pdev, card);
        return 0;
 
  _err:
@@ -326,53 +351,33 @@ static int __init snd_gusmax_probe(int dev)
        return err;
 }
 
-static int __init snd_gusmax_legacy_auto_probe(unsigned long xport)
+static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)
 {
-       static int dev;
-       int res;
-
-       for ( ; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
-                       continue;
-               port[dev] = xport;
-               res = snd_gusmax_probe(dev);
-               if (res < 0)
-                       port[dev] = SNDRV_AUTO_PORT;
-               return res;
-       }
-       return -ENODEV;
+       snd_card_free(dev_get_drvdata(devptr));
+       dev_set_drvdata(devptr, NULL);
+       return 0;
 }
 
+#define DEV_NAME "gusmax"
+
+static struct isa_driver snd_gusmax_driver = {
+       .match          = snd_gusmax_match,
+       .probe          = snd_gusmax_probe,
+       .remove         = __devexit_p(snd_gusmax_remove),
+       /* FIXME: suspend/resume */
+       .driver         = {
+               .name   = DEV_NAME
+       },
+};
+
 static int __init alsa_card_gusmax_init(void)
 {
-       static unsigned long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260, -1};
-       int dev, cards, i;
-
-       for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev] > 0; dev++) {
-               if (port[dev] == SNDRV_AUTO_PORT)
-                       continue;
-               if (snd_gusmax_probe(dev) >= 0)
-                       cards++;
-       }
-       i = snd_legacy_auto_probe(possible_ports, snd_gusmax_legacy_auto_probe);
-       if (i > 0)
-               cards += i;
-
-       if (!cards) {
-#ifdef MODULE
-               printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");
-#endif
-               return -ENODEV;
-       }
-       return 0;
+       return isa_register_driver(&snd_gusmax_driver, SNDRV_CARDS);
 }
 
 static void __exit alsa_card_gusmax_exit(void)
 {
-       int idx;
-
-       for (idx = 0; idx < SNDRV_CARDS; idx++)
-               snd_card_free(snd_gusmax_cards[idx]);
+       isa_unregister_driver(&snd_gusmax_driver);
 }
 
 module_init(alsa_card_gusmax_init)