[ALSA] Port the rest of ALSA ISA drivers to isa_driver

Port the rest of ALSA ISA drivers to use isa_driver framework
instead of platform_driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

1 files changed, 31 insertions, 55 deletions

diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index be1e83e6dea3..b7de1bc0e8a4 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -22,7 +22,7 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/err.h>
-#include <linux/platform_device.h>
+#include <linux/isa.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/moduleparam.h>
@@ -56,8 +56,6 @@ MODULE_PARM_DESC(irq, "IRQ # for SB8 driver.");
 module_param_array(dma8, int, NULL, 0444);
 MODULE_PARM_DESC(dma8, "8-bit DMA # for SB8 driver.");
 
-static struct platform_device *devices[SNDRV_CARDS];
-
 struct snd_sb8 {
         struct resource *fm_res;        /* used to block FM i/o region for legacy cards */
         struct snd_sb *chip;
@@ -83,9 +81,23 @@ static void snd_sb8_free(struct snd_card *card)
         release_and_free_resource(acard->fm_res);
 }
 
-static int __devinit snd_sb8_probe(struct platform_device *pdev)
+static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev)
+{
+        if (!enable[dev])
+                return 0;
+        if (irq[dev] == SNDRV_AUTO_IRQ) {
+                snd_printk(KERN_ERR "%s: please specify irq\n", pdev->bus_id);
+                return 0;
+        }
+        if (dma8[dev] == SNDRV_AUTO_DMA) {
+                snd_printk(KERN_ERR "%s: please specify dma8\n", pdev->bus_id);
+                return 0;
+        }
+        return 1;
+}
+
+static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)
 {
-        int dev = pdev->id;
         struct snd_sb *chip;
         struct snd_card *card;
         struct snd_sb8 *acard;
@@ -180,12 +192,12 @@ static int __devinit snd_sb8_probe(struct platform_device *pdev)
                 chip->port,
                 irq[dev], dma8[dev]);
 
-        snd_card_set_dev(card, &pdev->dev);
+        snd_card_set_dev(card, pdev);
 
         if ((err = snd_card_register(card)) < 0)
                 goto _err;
 
-        platform_set_drvdata(pdev, card);
+        dev_set_drvdata(pdev, card);
         return 0;
 
  _err:
@@ -193,17 +205,18 @@ static int __devinit snd_sb8_probe(struct platform_device *pdev)
         return err;
 }
 
-static int __devexit snd_sb8_remove(struct platform_device *pdev)
+static int __devexit snd_sb8_remove(struct device *pdev, unsigned int dev)
 {
-        snd_card_free(platform_get_drvdata(pdev));
-        platform_set_drvdata(pdev, NULL);
+        snd_card_free(dev_get_drvdata(pdev));
+        dev_set_drvdata(pdev, NULL);
         return 0;
 }
 
 #ifdef CONFIG_PM
-static int snd_sb8_suspend(struct platform_device *dev, pm_message_t state)
+static int snd_sb8_suspend(struct device *dev, unsigned int n,
+                           pm_message_t state)
 {
-        struct snd_card *card = platform_get_drvdata(dev);
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_sb8 *acard = card->private_data;
         struct snd_sb *chip = acard->chip;
 
@@ -213,9 +226,9 @@ static int snd_sb8_suspend(struct platform_device *dev, pm_message_t state)
         return 0;
 }
 
-static int snd_sb8_resume(struct platform_device *dev)
+static int snd_sb8_resume(struct device *dev, unsigned int n)
 {
-        struct snd_card *card = platform_get_drvdata(dev);
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_sb8 *acard = card->private_data;
         struct snd_sb *chip = acard->chip;
 
@@ -228,7 +241,8 @@ static int snd_sb8_resume(struct platform_device *dev)
 
 #define SND_SB8_DRIVER  "snd_sb8"
 
-static struct platform_driver snd_sb8_driver = {
+static struct isa_driver snd_sb8_driver = {
+        .match          = snd_sb8_match,
         .probe          = snd_sb8_probe,
         .remove         = __devexit_p(snd_sb8_remove),
 #ifdef CONFIG_PM
@@ -240,52 +254,14 @@ static struct platform_driver snd_sb8_driver = {
         },
 };
 
-static void __init_or_module snd_sb8_unregister_all(void)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(devices); ++i)
-                platform_device_unregister(devices[i]);
-        platform_driver_unregister(&snd_sb8_driver);
-}
-
 static int __init alsa_card_sb8_init(void)
 {
-        int i, cards, err;
-
-        err = platform_driver_register(&snd_sb8_driver);
-        if (err < 0)
-                return err;
-
-        cards = 0;
-        for (i = 0; i < SNDRV_CARDS; i++) {
-                struct platform_device *device;
-                if (! enable[i])
-                        continue;
-                device = platform_device_register_simple(SND_SB8_DRIVER,
-                                                         i, NULL, 0);
-                if (IS_ERR(device))
-                        continue;
-                if (!platform_get_drvdata(device)) {
-                        platform_device_unregister(device);
-                        continue;
-                }
-                devices[i] = device;
-                cards++;
-        }
-        if (!cards) {
-#ifdef MODULE
-                snd_printk(KERN_ERR "Sound Blaster soundcard not found or device busy\n");
-#endif
-                snd_sb8_unregister_all();
-                return -ENODEV;
-        }
-        return 0;
+        return isa_register_driver(&snd_sb8_driver, SNDRV_CARDS);
 }
 
 static void __exit alsa_card_sb8_exit(void)
 {
-        snd_sb8_unregister_all();
+        isa_unregister_driver(&snd_sb8_driver);
 }
 
 module_init(alsa_card_sb8_init)