[ALSA] gus - Use platform_device
Takashi Iwai [Thu, 17 Nov 2005 16:13:43 +0000 (17:13 +0100)]
Rewrite the probe/remove with platform_device.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/isa/gus/gusclassic.c
sound/isa/gus/gusextreme.c
sound/isa/gus/gusmax.c
sound/isa/gus/interwave.c

index 6db484f..57beb74 100644 (file)
  */
 
 #include <sound/driver.h>
-#include <asm/dma.h>
 #include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.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>
-#define SNDRV_LEGACY_AUTO_PROBE
 #define SNDRV_LEGACY_FIND_FREE_IRQ
 #define SNDRV_LEGACY_FIND_FREE_DMA
 #include <sound/initval.h>
@@ -70,7 +71,6 @@ MODULE_PARM_DESC(channels, "GF1 channels for GUS Classic driver.");
 module_param_array(pcm_channels, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Classic driver.");
 
-static struct snd_card *snd_gusclassic_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 
 #define PFX    "gusclassic: "
 
@@ -101,20 +101,19 @@ static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus)
        gus->joystick_dac = joystick_dac[dev];
 }
 
-static int __init snd_gusclassic_probe(int dev)
+static int __init snd_gusclassic_probe(struct platform_device *pdev)
 {
+       int dev = pdev->id;
        static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
        static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
        int xirq, xdma1, xdma2;
        struct snd_card *card;
-       struct snd_gusclassic *guscard;
        struct snd_gus_card *gus = NULL;
        int err;
 
        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
        if (card == NULL)
                return -ENOMEM;
-       guscard = (struct snd_gusclassic *)card->private_data;
        if (pcm_channels[dev] < 2)
                pcm_channels[dev] = 2;
 
@@ -143,12 +142,31 @@ static int __init snd_gusclassic_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 {
+               /* auto-probe legacy ports */
+               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_gusclassic_detect(gus)) < 0)
@@ -178,13 +196,12 @@ static int __init snd_gusclassic_probe(int dev)
        if (dma2 >= 0)
                sprintf(card->longname + strlen(card->longname), "&%d", xdma2);
 
-       if ((err = snd_card_set_generic_dev(card)) < 0)
-               goto _err;
+       snd_card_set_dev(card, &pdev->dev);
 
        if ((err = snd_card_register(card)) < 0)
                goto _err;
 
-       snd_gusclassic_cards[dev] = card;
+       platform_set_drvdata(pdev, card);
        return 0;
 
  _err:
@@ -192,53 +209,60 @@ static int __init snd_gusclassic_probe(int dev)
        return err;
 }
 
-static int __init snd_gusclassic_legacy_auto_probe(unsigned long xport)
+static int snd_gusclassic_remove(struct platform_device *devptr)
 {
-       static int dev;
-       int res;
-
-       for ( ; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
-                       continue;
-               port[dev] = xport;
-               res = snd_gusclassic_probe(dev);
-               if (res < 0)
-                       port[dev] = SNDRV_AUTO_PORT;
-               return res;
-       }
-       return -ENODEV;
+       snd_card_free(platform_get_drvdata(devptr));
+       platform_set_drvdata(devptr, NULL);
+       return 0;
 }
 
+#define GUSCLASSIC_DRIVER      "snd_gusclassic"
+
+static struct platform_driver snd_gusclassic_driver = {
+       .probe          = snd_gusclassic_probe,
+       .remove         = snd_gusclassic_remove,
+       /* FIXME: suspend/resume */
+       .driver         = {
+               .name   = GUSCLASSIC_DRIVER
+       },
+};
+
 static int __init alsa_card_gusclassic_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]; dev++) {
-               if (port[dev] == SNDRV_AUTO_PORT)
-                       continue;
-               if (snd_gusclassic_probe(dev) >= 0)
-                       cards++;
-       }
-       i = snd_legacy_auto_probe(possible_ports, snd_gusclassic_legacy_auto_probe);
-       if (i > 0)
-               cards += i;
+       int i, cards, err;
+
+       err = platform_driver_register(&snd_gusclassic_driver);
+       if (err < 0)
+               return err;
 
+       cards = 0;
+       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+               struct platform_device *device;
+               device = platform_device_register_simple(GUSCLASSIC_DRIVER,
+                                                        i, NULL, 0);
+               if (IS_ERR(device)) {
+                       err = PTR_ERR(device);
+                       goto errout;
+               }
+               cards++;
+       }
        if (!cards) {
 #ifdef MODULE
                printk(KERN_ERR "GUS Classic soundcard not found or device busy\n");
 #endif
-               return -ENODEV;
+               err = -ENODEV;
+               goto errout;
        }
        return 0;
+
+ errout:
+       platform_driver_unregister(&snd_gusclassic_driver);
+       return err;
 }
 
 static void __exit alsa_card_gusclassic_exit(void)
 {
-       int idx;
-       
-       for (idx = 0; idx < SNDRV_CARDS; idx++)
-               snd_card_free(snd_gusclassic_cards[idx]);
+       platform_driver_unregister(&snd_gusclassic_driver);
 }
 
 module_init(alsa_card_gusclassic_init)
index 9be59d5..6fad973 100644 (file)
  */
 
 #include <sound/driver.h>
-#include <asm/dma.h>
 #include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.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/es1688.h>
@@ -85,7 +87,6 @@ MODULE_PARM_DESC(channels, "GF1 channels for GUS Extreme driver.");
 module_param_array(pcm_channels, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Extreme driver.");
 
-static struct snd_card *snd_gusextreme_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 
 #define PFX    "gusextreme: "
 
@@ -166,15 +167,15 @@ static int __init snd_gusextreme_mixer(struct snd_es1688 *chip)
        return 0;
 }
 
-static int __init snd_gusextreme_probe(int dev)
+static int __init snd_gusextreme_probe(struct platform_device *pdev)
 {
+       int dev = pdev->id;
        static int possible_ess_irqs[] = {5, 9, 10, 7, -1};
        static int possible_ess_dmas[] = {1, 3, 0, -1};
        static int possible_gf1_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
        static int possible_gf1_dmas[] = {5, 6, 7, 1, 3, -1};
        int xgf1_irq, xgf1_dma, xess_irq, xmpu_irq, xess_dma;
        struct snd_card *card;
-       struct snd_gusextreme *acard;
        struct snd_gus_card *gus;
        struct snd_es1688 *es1688;
        struct snd_opl3 *opl3;
@@ -183,7 +184,6 @@ static int __init snd_gusextreme_probe(int dev)
        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
        if (card == NULL)
                return -ENOMEM;
-       acard = (struct snd_gusextreme *)card->private_data;
 
        xgf1_irq = gf1_irq[dev];
        if (xgf1_irq == SNDRV_AUTO_IRQ) {
@@ -223,10 +223,29 @@ static int __init snd_gusextreme_probe(int dev)
                }
        }
 
-       if ((err = snd_es1688_create(card, port[dev], mpu_port[dev],
-                                    xess_irq, xmpu_irq, xess_dma,
-                                    ES1688_HW_1688, &es1688)) < 0)
+       if (port[dev] != SNDRV_AUTO_PORT) {
+               err = snd_es1688_create(card, port[dev], mpu_port[dev],
+                                       xess_irq, xmpu_irq, xess_dma,
+                                       ES1688_HW_1688, &es1688);
+       } else {
+               /* auto-probe legacy ports */
+               static unsigned long possible_ports[] = {0x220, 0x240, 0x260};
+               int i;
+               for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
+                       err = snd_es1688_create(card,
+                                               possible_ports[i],
+                                               mpu_port[dev],
+                                               xess_irq, xmpu_irq, xess_dma,
+                                               ES1688_HW_1688, &es1688);
+                       if (err >= 0) {
+                               port[dev] = possible_ports[i];
+                               break;
+                       }
+               }
+       }
+       if (err < 0)
                goto out;
+
        if (gf1_port[dev] < 0)
                gf1_port[dev] = port[dev] + 0x20;
        if ((err = snd_gus_create(card,
@@ -287,13 +306,12 @@ static int __init snd_gusextreme_probe(int dev)
        sprintf(card->longname, "Gravis UltraSound Extreme at 0x%lx, irq %i&%i, dma %i&%i",
                es1688->port, xgf1_irq, xess_irq, xgf1_dma, xess_dma);
 
-       if ((err = snd_card_set_generic_dev(card)) < 0)
-               goto out;
+       snd_card_set_dev(card, &pdev->dev);
 
        if ((err = snd_card_register(card)) < 0)
                goto out;
 
-       snd_gusextreme_cards[dev] = card;
+       platform_set_drvdata(pdev, card);
        return 0;
 
       out:
@@ -301,60 +319,60 @@ static int __init snd_gusextreme_probe(int dev)
        return err;
 }
 
-static int __init snd_gusextreme_legacy_auto_probe(unsigned long xport)
+static int snd_gusextreme_remove(struct platform_device *devptr)
 {
-        static int dev;
-        int res;
-
-        for ( ; dev < SNDRV_CARDS; dev++) {
-                if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
-                        continue;
-                port[dev] = xport;
-                res = snd_gusextreme_probe(dev);
-                if (res < 0)
-                        port[dev] = SNDRV_AUTO_PORT;
-                return res;
-        }
-        return -ENODEV;
+       snd_card_free(platform_get_drvdata(devptr));
+       platform_set_drvdata(devptr, NULL);
+       return 0;
 }
 
+#define GUSEXTREME_DRIVER      "snd_gusextreme"
+
+static struct platform_driver snd_gusextreme_driver = {
+       .probe          = snd_gusextreme_probe,
+       .remove         = snd_gusextreme_remove,
+       /* FIXME: suspend/resume */
+       .driver         = {
+               .name   = GUSEXTREME_DRIVER
+       },
+};
+
 static int __init alsa_card_gusextreme_init(void)
 {
-       static unsigned long possible_ports[] = {0x220, 0x240, 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_gusextreme_probe(dev) >= 0)
-                       cards++;
-       }
-       i = snd_legacy_auto_probe(possible_ports, snd_gusextreme_legacy_auto_probe);
-       if (i > 0)
-               cards += i;
+       int i, cards, err;
+
+       err = platform_driver_register(&snd_gusextreme_driver);
+       if (err < 0)
+               return err;
 
+       cards = 0;
+       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+               struct platform_device *device;
+               device = platform_device_register_simple(GUSEXTREME_DRIVER,
+                                                        i, NULL, 0);
+               if (IS_ERR(device)) {
+                       err = PTR_ERR(device);
+                       goto errout;
+               }
+               cards++;
+       }
        if (!cards) {
 #ifdef MODULE
                printk(KERN_ERR "GUS Extreme soundcard not found or device busy\n");
 #endif
-               return -ENODEV;
+               err = -ENODEV;
+               goto errout;
        }
        return 0;
+
+ errout:
+       platform_driver_unregister(&snd_gusextreme_driver);
+       return err;
 }
 
 static void __exit alsa_card_gusextreme_exit(void)
 {
-       int idx;
-       struct snd_card *card;
-       struct snd_gusextreme *acard;
-
-       for (idx = 0; idx < SNDRV_CARDS; idx++) {
-               card = snd_gusextreme_cards[idx];
-               if (card == NULL)
-                       continue;
-               acard = (struct snd_gusextreme *)card->private_data;
-               snd_card_free(snd_gusextreme_cards[idx]);
-       }
+       platform_driver_unregister(&snd_gusextreme_driver);
 }
 
 module_init(alsa_card_gusextreme_init)
index 63311cd..d1b70ee 100644 (file)
  */
 
 #include <sound/driver.h>
-#include <asm/dma.h>
 #include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.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>
@@ -80,8 +81,6 @@ 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)
@@ -203,8 +202,9 @@ 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 __init snd_gusmax_probe(struct platform_device *pdev)
 {
+       int dev = pdev->id;
        static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
        static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
        int xirq, xdma1, xdma2, err;
@@ -247,12 +247,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)
@@ -310,15 +330,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->dev);
 
        if ((err = snd_card_register(card)) < 0)
                goto _err;
                
        maxcard->gus = gus;
        maxcard->cs4231 = cs4231;
-       snd_gusmax_cards[dev] = card;
+
+       platform_set_drvdata(pdev, card);
        return 0;
 
  _err:
@@ -326,53 +346,60 @@ static int __init snd_gusmax_probe(int dev)
        return err;
 }
 
-static int __init snd_gusmax_legacy_auto_probe(unsigned long xport)
+static int snd_gusmax_remove(struct platform_device *devptr)
 {
-       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(platform_get_drvdata(devptr));
+       platform_set_drvdata(devptr, NULL);
+       return 0;
 }
 
+#define GUSMAX_DRIVER  "snd_gusmax"
+
+static struct platform_driver snd_gusmax_driver = {
+       .probe          = snd_gusmax_probe,
+       .remove         = snd_gusmax_remove,
+       /* FIXME: suspend/resume */
+       .driver         = {
+               .name   = GUSMAX_DRIVER
+       },
+};
+
 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;
+       int i, cards, err;
+
+       err = platform_driver_register(&snd_gusmax_driver);
+       if (err < 0)
+               return err;
 
+       cards = 0;
+       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+               struct platform_device *device;
+               device = platform_device_register_simple(GUSMAX_DRIVER,
+                                                        i, NULL, 0);
+               if (IS_ERR(device)) {
+                       err = PTR_ERR(device);
+                       goto errout;
+               }
+               cards++;
+       }
        if (!cards) {
 #ifdef MODULE
                printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");
 #endif
-               return -ENODEV;
+               err = -ENODEV;
+               goto errout;
        }
        return 0;
+
+ errout:
+       platform_driver_unregister(&snd_gusmax_driver);
+       return err;
 }
 
 static void __exit alsa_card_gusmax_exit(void)
 {
-       int idx;
-
-       for (idx = 0; idx < SNDRV_CARDS; idx++)
-               snd_card_free(snd_gusmax_cards[idx]);
+       platform_driver_unregister(&snd_gusmax_driver);
 }
 
 module_init(alsa_card_gusmax_init)
index f2e9c50..67a5f74 100644 (file)
  */
 
 #include <sound/driver.h>
-#include <asm/dma.h>
-#include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include <linux/moduleparam.h>
+#include <asm/dma.h>
 #include <sound/core.h>
 #include <sound/gus.h>
 #include <sound/cs4231.h>
 #ifdef SNDRV_STB
 #include <sound/tea6330t.h>
 #endif
-#define SNDRV_LEGACY_AUTO_PROBE
 #define SNDRV_LEGACY_FIND_FREE_IRQ
 #define SNDRV_LEGACY_FIND_FREE_DMA
 #include <sound/initval.h>
@@ -75,8 +76,12 @@ static int effect[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
 
 #ifdef SNDRV_STB
 #define PFX "interwave-stb: "
+#define INTERWAVE_DRIVER       "snd_interwave_stb"
+#define INTERWAVE_PNP_DRIVER   "interwave-stb"
 #else
 #define PFX "interwave: "
+#define INTERWAVE_DRIVER       "snd_interwave"
+#define INTERWAVE_PNP_DRIVER   "interwave"
 #endif
 
 module_param_array(index, int, NULL, 0444);
@@ -128,7 +133,6 @@ struct snd_interwave {
 #endif
 };
 
-static struct snd_card *snd_interwave_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 
 #ifdef CONFIG_PNP
 
@@ -633,7 +637,7 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard,
 
 static void snd_interwave_free(struct snd_card *card)
 {
-       struct snd_interwave *iwcard = (struct snd_interwave *)card->private_data;
+       struct snd_interwave *iwcard = card->private_data;
 
        if (iwcard == NULL)
                return;
@@ -644,14 +648,26 @@ static void snd_interwave_free(struct snd_card *card)
                free_irq(iwcard->irq, (void *)iwcard);
 }
 
-static int __devinit snd_interwave_probe(int dev, struct pnp_card_link *pcard,
-                                        const struct pnp_card_device_id *pid)
+static struct snd_card *snd_interwave_card_new(int dev)
 {
-       static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
-       static int possible_dmas[] = {0, 1, 3, 5, 6, 7, -1};
-       int xirq, xdma1, xdma2;
        struct snd_card *card;
        struct snd_interwave *iwcard;
+
+       card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_interwave));
+       if (card == NULL)
+               return NULL;
+       iwcard = card->private_data;
+       iwcard->card = card;
+       iwcard->irq = -1;
+       card->private_free = snd_interwave_free;
+       return card;
+}
+
+static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
+{
+       int xirq, xdma1, xdma2;
+       struct snd_interwave *iwcard = card->private_data;
        struct snd_cs4231 *cs4231;
        struct snd_gus_card *gus;
 #ifdef SNDRV_STB
@@ -661,59 +677,23 @@ static int __devinit snd_interwave_probe(int dev, struct pnp_card_link *pcard,
        char *str;
        int err;
 
-       card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                           sizeof(struct snd_interwave));
-       if (card == NULL)
-               return -ENOMEM;
-       iwcard = (struct snd_interwave *)card->private_data;
-       iwcard->card = card;
-       iwcard->irq = -1;
-       card->private_free = snd_interwave_free;
-#ifdef CONFIG_PNP
-       if (isapnp[dev]) {
-               if ((err = snd_interwave_pnp(dev, iwcard, pcard, pid)) < 0)
-                       goto _err;
-               snd_card_set_dev(card, &pcard->card->dev);
-       }
-#endif
        xirq = irq[dev];
-       if (xirq == SNDRV_AUTO_IRQ) {
-               if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
-                       snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
-                       err = -EBUSY;
-                       goto _err;
-               }
-       }
        xdma1 = dma1[dev];
-       if (xdma1 == SNDRV_AUTO_DMA) {
-               if ((xdma1 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
-                       snd_printk(KERN_ERR PFX "unable to find a free DMA1\n");
-                       err = -EBUSY;
-                       goto _err;
-               }
-       }
        xdma2 = dma2[dev];
-       if (xdma2 == SNDRV_AUTO_DMA) {
-               if ((xdma2 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
-                       snd_printk(KERN_ERR PFX "unable to find a free DMA2\n");
-                       err = -EBUSY;
-                       goto _err;
-               }
-       }
 
        if ((err = snd_gus_create(card,
                                  port[dev],
                                  -xirq, xdma1, xdma2,
                                  0, 32,
                                  pcm_channels[dev], effect[dev], &gus)) < 0)
-               goto _err;
+               return err;
 
        if ((err = snd_interwave_detect(iwcard, gus, dev
 #ifdef SNDRV_STB
             , &i2c_bus
 #endif
            )) < 0)
-               goto _err;
+               return err;
 
        iwcard->gus_status_reg = gus->gf1.reg_irqstat;
        iwcard->pcm_status_reg = gus->gf1.port + 0x10c + 2;
@@ -721,12 +701,12 @@ static int __devinit snd_interwave_probe(int dev, struct pnp_card_link *pcard,
        snd_interwave_init(dev, gus);
        snd_interwave_detect_memory(gus);
        if ((err = snd_gus_initialize(gus)) < 0)
-               goto _err;
+               return err;
 
-       if (request_irq(xirq, snd_interwave_interrupt, SA_INTERRUPT, "InterWave", (void *)iwcard)) {
+       if (request_irq(xirq, snd_interwave_interrupt, SA_INTERRUPT,
+                       "InterWave", iwcard)) {
                snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
-               err = -EBUSY;
-               goto _err;
+               return -EBUSY;
        }
        iwcard->irq = xirq;
 
@@ -738,26 +718,26 @@ static int __devinit snd_interwave_probe(int dev, struct pnp_card_link *pcard,
                                     CS4231_HWSHARE_DMA1 |
                                     CS4231_HWSHARE_DMA2,
                                     &cs4231)) < 0)
-               goto _err;
+               return err;
 
        if ((err = snd_cs4231_pcm(cs4231, 0, &pcm)) < 0)
-               goto _err;
+               return err;
 
        sprintf(pcm->name + strlen(pcm->name), " rev %c", gus->revision + 'A');
        strcat(pcm->name, " (codec)");
 
        if ((err = snd_cs4231_timer(cs4231, 2, NULL)) < 0)
-               goto _err;
+               return err;
 
        if ((err = snd_cs4231_mixer(cs4231)) < 0)
-               goto _err;
+               return err;
 
        if (pcm_channels[dev] > 0) {
                if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) < 0)
-                       goto _err;
+                       return err;
        }
        if ((err = snd_interwave_mixer(cs4231)) < 0)
-               goto _err;
+               return err;
 
 #ifdef SNDRV_STB
        {
@@ -769,19 +749,19 @@ static int __devinit snd_interwave_probe(int dev, struct pnp_card_link *pcard,
                strcpy(id2.name, id1.name);
                id2.index = 1;
                if ((err = snd_ctl_rename_id(card, &id1, &id2)) < 0)
-                       goto _err;
+                       return err;
                strcpy(id1.name, "Master Playback Volume");
                strcpy(id2.name, id1.name);
                if ((err = snd_ctl_rename_id(card, &id1, &id2)) < 0)
-                       goto _err;
+                       return err;
                if ((err = snd_tea6330t_update_mixer(card, i2c_bus, 0, 1)) < 0)
-                       goto _err;
+                       return err;
        }
 #endif
 
        gus->uart_enable = midi[dev];
        if ((err = snd_gf1_rawmidi_new(gus, 0, NULL)) < 0)
-               goto _err;
+               return err;
 
 #ifndef SNDRV_STB
        str = "AMD InterWave";
@@ -800,121 +780,171 @@ static int __devinit snd_interwave_probe(int dev, struct pnp_card_link *pcard,
        if (xdma2 >= 0)
                sprintf(card->longname + strlen(card->longname), "&%d", xdma2);
 
-       if ((err = snd_card_set_generic_dev(card)) < 0)
-               goto _err;
-
        if ((err = snd_card_register(card)) < 0)
-               goto _err;
+               return err;
        
        iwcard->cs4231 = cs4231;
        iwcard->gus = gus;
-       if (pcard)
-               pnp_set_card_drvdata(pcard, card);
-       else
-               snd_interwave_legacy[dev++] = card;
        return 0;
+}
 
- _err:
-       snd_card_free(card);
-       return err;
+static int __init snd_interwave_nonpnp_probe1(int dev, struct platform_device *devptr)
+{
+       struct snd_card *card;
+       int err;
+
+       card = snd_interwave_card_new(dev);
+       if (! card)
+               return -ENOMEM;
+
+       snd_card_set_dev(card, &devptr->dev);
+       if ((err = snd_interwave_probe(card, dev)) < 0) {
+               snd_card_free(card);
+               return err;
+       }
+       platform_set_drvdata(devptr, card);
+       return 0;
 }
 
-static int __devinit snd_interwave_probe_legacy_port(unsigned long xport)
+static int __init snd_interwave_nonpnp_probe(struct platform_device *pdev)
 {
-       static int dev;
-       int res;
+       int dev = pdev->id;
+       int err;
+       static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
+       static int possible_dmas[] = {0, 1, 3, 5, 6, 7, -1};
 
-       for ( ; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
-                        continue;
-#ifdef CONFIG_PNP
-               if (isapnp[dev])
-                       continue;
-#endif
-               port[dev] = xport;
-               res = snd_interwave_probe(dev, NULL, NULL);
-               if (res < 0)
-                       port[dev] = SNDRV_AUTO_PORT;
-               return res;
+       if (irq[dev] == SNDRV_AUTO_IRQ) {
+               if ((irq[dev] = snd_legacy_find_free_irq(possible_irqs)) < 0) {
+                       snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
+                       return -EBUSY;
+               }
+       }
+       if (dma1[dev] == SNDRV_AUTO_DMA) {
+               if ((dma1[dev] = snd_legacy_find_free_dma(possible_dmas)) < 0) {
+                       snd_printk(KERN_ERR PFX "unable to find a free DMA1\n");
+                       return -EBUSY;
+               }
+       }
+       if (dma2[dev] == SNDRV_AUTO_DMA) {
+               if ((dma2[dev] = snd_legacy_find_free_dma(possible_dmas)) < 0) {
+                       snd_printk(KERN_ERR PFX "unable to find a free DMA2\n");
+                       return -EBUSY;
+               }
+       }
+
+       if (port[dev] != SNDRV_AUTO_PORT)
+               return snd_interwave_nonpnp_probe1(dev, pdev);
+       else {
+               static long possible_ports[] = {0x210, 0x220, 0x230, 0x240, 0x250, 0x260};
+               int i;
+               for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
+                       port[dev] = possible_ports[i];
+                       err = snd_interwave_nonpnp_probe1(dev, pdev);
+                       if (! err)
+                               return 0;
+               }
+               return err;
        }
-       return -ENODEV;
 }
 
+static int __devexit snd_interwave_nonpnp_remove(struct platform_device *devptr)
+{
+       snd_card_free(platform_get_drvdata(devptr));
+       platform_set_drvdata(devptr, NULL);
+       return 0;
+}
+
+static struct platform_driver snd_interwave_driver = {
+       .probe          = snd_interwave_nonpnp_probe,
+       .remove         = __devexit_p(snd_interwave_nonpnp_remove),
+       /* FIXME: suspend,resume */
+       .driver         = {
+               .name   = INTERWAVE_DRIVER
+       },
+};
+
 #ifdef CONFIG_PNP
 
-static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *card,
-                                          const struct pnp_card_device_id *id)
+static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
+                                             const struct pnp_card_device_id *pid)
 {
        static int dev;
+       struct snd_card *card;
        int res;
 
        for ( ; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || !isapnp[dev])
-                       continue;
-               res = snd_interwave_probe(dev, card, id);
-               if (res < 0)
-                       return res;
-               dev++;
-               return 0;
-        }
-
-        return -ENODEV;
+               if (enable[dev] && isapnp[dev])
+                       break;
+       }
+       if (dev >= SNDRV_CARDS)
+               return -ENODEV;
+                               
+       card = snd_interwave_card_new(dev);
+       if (! card)
+               return -ENOMEM;
+
+       if ((res = snd_interwave_pnp(dev, card->private_data, pcard, pid)) < 0) {
+               snd_card_free(card);
+               return res;
+       }
+       snd_card_set_dev(card, &pcard->card->dev);
+       if ((res = snd_interwave_probe(card, dev)) < 0) {
+               snd_card_free(card);
+               return res;
+       }
+       pnp_set_card_drvdata(pcard, card);
+       dev++;
+       return 0;
 }
 
 static void __devexit snd_interwave_pnp_remove(struct pnp_card_link * pcard)
 {
-       struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
-
-       snd_card_disconnect(card);
-       snd_card_free_in_thread(card);
+       snd_card_free(pnp_get_card_drvdata(pcard));
+       pnp_set_card_drvdata(pcard, NULL);
 }
 
 static struct pnp_card_driver interwave_pnpc_driver = {
        .flags = PNP_DRIVER_RES_DISABLE,
-       .name = "interwave",
+       .name = INTERWAVE_PNP_DRIVER,
        .id_table = snd_interwave_pnpids,
        .probe = snd_interwave_pnp_detect,
        .remove = __devexit_p(snd_interwave_pnp_remove),
+       /* FIXME: suspend,resume */
 };
 
 #endif /* CONFIG_PNP */
 
 static int __init alsa_card_interwave_init(void)
 {
-       int cards = 0, i;
-       static long possible_ports[] = {0x210, 0x220, 0x230, 0x240, 0x250, 0x260, -1};
-       int dev;
+       int i, err, cards = 0;
 
-       for (dev = 0; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev] || port[dev] == SNDRV_AUTO_PORT)
-                       continue;
+       if ((err = platform_driver_register(&snd_interwave_driver)) < 0)
+               return err;
+
+       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+               struct platform_device *device;
 #ifdef CONFIG_PNP
-               if (isapnp[dev])
+               if (isapnp[i])
                        continue;
 #endif
-               if (!snd_interwave_probe(dev, NULL, NULL)) {
-                       cards++;
-                       continue;
+               device = platform_device_register_simple(INTERWAVE_DRIVER,
+                                                        i, NULL, 0);
+               if (IS_ERR(device)) {
+                       err = PTR_ERR(device);
+                       platform_driver_unregister(&snd_interwave_driver);
+                       return err;
                }
-#ifdef MODULE
-               printk(KERN_ERR "InterWave soundcard #%i not found at 0x%lx or device busy\n", dev, port[dev]);
-#endif
+               cards++;
        }
-       /* legacy auto configured cards */
-       i = snd_legacy_auto_probe(possible_ports, snd_interwave_probe_legacy_port);
-       if (i > 0)
-               cards += i;
-#ifdef CONFIG_PNP
+
        /* ISA PnP cards */
        i = pnp_register_card_driver(&interwave_pnpc_driver);
        if (i > 0)
                cards += i;
-#endif
 
        if (!cards) {
-#ifdef CONFIG_PNP
                pnp_unregister_card_driver(&interwave_pnpc_driver);
-#endif
+               platform_driver_unregister(&snd_interwave_driver);
 #ifdef MODULE
                printk(KERN_ERR "InterWave soundcard not found or device busy\n");
 #endif
@@ -925,14 +955,8 @@ static int __init alsa_card_interwave_init(void)
 
 static void __exit alsa_card_interwave_exit(void)
 {
-       int dev;
-
-#ifdef CONFIG_PNP
-       /* PnP cards first */
        pnp_unregister_card_driver(&interwave_pnpc_driver);
-#endif
-       for (dev = 0; dev < SNDRV_CARDS; dev++)
-               snd_card_free(snd_interwave_legacy[dev]);
+       platform_driver_unregister(&snd_interwave_driver);
 }
 
 module_init(alsa_card_interwave_init)