Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / drivers / mpu401 / mpu401.c

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index cb36ecb..77b0600 100644 (file)
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -23,6 +23,8 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/pnp.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/mpu401.h>
@@ -56,12 +58,13 @@ MODULE_PARM_DESC(port, "Port # for MPU-401 device.");
 module_param_array(irq, int, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");
 
-static snd_card_t *snd_mpu401_legacy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-static int pnp_registered = 0;
+static struct platform_device *platform_devices[SNDRV_CARDS];
+static int pnp_registered;
+static unsigned int snd_mpu401_devices;
 
-static int snd_mpu401_create(int dev, snd_card_t **rcard)
+static int snd_mpu401_create(int dev, struct snd_card **rcard)
 {
-       snd_card_t *card;
+       struct snd_card *card;
        int err;
 
        *rcard = NULL;
@@ -77,24 +80,28 @@ static int snd_mpu401_create(int dev, snd_card_t **rcard)
                strcat(card->longname, "polled");
        }
 
-       if (snd_mpu401_uart_new(card, 0,
-                               MPU401_HW_MPU401,
-                               port[dev], 0,
-                               irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0) {
+       if ((err = snd_mpu401_uart_new(card, 0,
+                                      MPU401_HW_MPU401,
+                                      port[dev], 0,
+                                      irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) {
                printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
-               snd_card_free(card);
-               return -ENODEV;
-       }
-       if ((err = snd_card_register(card)) < 0) {
-               snd_card_free(card);
-               return err;
+               goto _err;
        }
+
        *rcard = card;
        return 0;
+
+ _err:
+       snd_card_free(card);
+       return err;
 }
 
-static int __devinit snd_mpu401_probe(int dev)
+static int __devinit snd_mpu401_probe(struct platform_device *devptr)
 {
+       int dev = devptr->id;
+       int err;
+       struct snd_card *card;
+
        if (port[dev] == SNDRV_AUTO_PORT) {
                snd_printk(KERN_ERR "specify port\n");
                return -EINVAL;
@@ -103,9 +110,36 @@ static int __devinit snd_mpu401_probe(int dev)
                snd_printk(KERN_ERR "specify or disable IRQ\n");
                return -EINVAL;
        }
-       return snd_mpu401_create(dev, &snd_mpu401_legacy_cards[dev]);
+       err = snd_mpu401_create(dev, &card);
+       if (err < 0)
+               return err;
+       snd_card_set_dev(card, &devptr->dev);
+       if ((err = snd_card_register(card)) < 0) {
+               snd_card_free(card);
+               return err;
+       }
+       platform_set_drvdata(devptr, card);
+       return 0;
+}
+
+static int __devexit snd_mpu401_remove(struct platform_device *devptr)
+{
+       snd_card_free(platform_get_drvdata(devptr));
+       platform_set_drvdata(devptr, NULL);
+       return 0;
 }
 
+#define SND_MPU401_DRIVER      "snd_mpu401"
+
+static struct platform_driver snd_mpu401_driver = {
+       .probe          = snd_mpu401_probe,
+       .remove         = __devexit_p(snd_mpu401_remove),
+       .driver         = {
+               .name   = SND_MPU401_DRIVER
+       },
+};
+
+
 #ifdef CONFIG_PNP
 
 #define IO_EXTENT 2
@@ -117,7 +151,7 @@ static struct pnp_device_id snd_mpu401_pnpids[] = {
 
 MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids);
 
-static int __init snd_mpu401_pnp(int dev, struct pnp_dev *device,
+static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
                                 const struct pnp_device_id *id)
 {
        if (!pnp_port_valid(device, 0) ||
@@ -146,7 +180,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
                                          const struct pnp_device_id *id)
 {
        static int dev;
-       snd_card_t *card;
+       struct snd_card *card;
        int err;
 
        for ( ; dev < SNDRV_CARDS; ++dev) {
@@ -158,8 +192,13 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
                err = snd_mpu401_create(dev, &card);
                if (err < 0)
                        return err;
+               if ((err = snd_card_register(card)) < 0) {
+                       snd_card_free(card);
+                       return err;
+               }
                snd_card_set_dev(card, &pnp_dev->dev);
                pnp_set_drvdata(pnp_dev, card);
+               snd_mpu401_devices++;
                ++dev;
                return 0;
        }
@@ -168,7 +207,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
 
 static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev)
 {
-       snd_card_t *card = (snd_card_t *) pnp_get_drvdata(dev);
+       struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
 
        snd_card_disconnect(card);
        snd_card_free_in_thread(card);
@@ -184,32 +223,48 @@ static struct pnp_driver snd_mpu401_pnp_driver = {
 static struct pnp_driver snd_mpu401_pnp_driver;
 #endif
 
+static void __init_or_module snd_mpu401_unregister_all(void)
+{
+       int i;
+
+       if (pnp_registered)
+               pnp_unregister_driver(&snd_mpu401_pnp_driver);
+       for (i = 0; i < ARRAY_SIZE(platform_devices); ++i)
+               platform_device_unregister(platform_devices[i]);
+       platform_driver_unregister(&snd_mpu401_driver);
+}
+
 static int __init alsa_card_mpu401_init(void)
 {
-       int dev, devices = 0;
-       int err;
+       int i, err;
 
-       for (dev = 0; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev])
+       if ((err = platform_driver_register(&snd_mpu401_driver)) < 0)
+               return err;
+
+       for (i = 0; i < SNDRV_CARDS; i++) {
+               struct platform_device *device;
+               if (! enable[i])
                        continue;
 #ifdef CONFIG_PNP
-               if (pnp[dev])
+               if (pnp[i])
                        continue;
 #endif
-               if (snd_mpu401_probe(dev) >= 0)
-                       devices++;
+               device = platform_device_register_simple(SND_MPU401_DRIVER,
+                                                        i, NULL, 0);
+               if (IS_ERR(device))
+                       continue;
+               platform_devices[i] = device;
+               snd_mpu401_devices++;
        }
-       if ((err = pnp_register_driver(&snd_mpu401_pnp_driver)) >= 0) {
+       err = pnp_register_driver(&snd_mpu401_pnp_driver);
+       if (!err)
                pnp_registered = 1;
-               devices += err;
-       }
 
-       if (!devices) {
+       if (!snd_mpu401_devices) {
 #ifdef MODULE
                printk(KERN_ERR "MPU-401 device not found or device busy\n");
 #endif
-               if (pnp_registered)
-                       pnp_unregister_driver(&snd_mpu401_pnp_driver);
+               snd_mpu401_unregister_all();
                return -ENODEV;
        }
        return 0;
@@ -217,12 +272,7 @@ static int __init alsa_card_mpu401_init(void)
 
 static void __exit alsa_card_mpu401_exit(void)
 {
-       int idx;
-
-       if (pnp_registered)
-               pnp_unregister_driver(&snd_mpu401_pnp_driver);
-       for (idx = 0; idx < SNDRV_CARDS; idx++)
-               snd_card_free(snd_mpu401_legacy_cards[idx]);
+       snd_mpu401_unregister_all();
 }
 
 module_init(alsa_card_mpu401_init)