[ALSA] opl3sa2 - Use platform_device

Modules: OPL3SA2 driver

Rewrite the probe/remove with platform_device.

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

1 files changed, 228 insertions, 200 deletions

diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index a343af70f519..b923de9b321d 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -21,6 +21,8 @@
 
 #include <sound/driver.h>
 #include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
@@ -126,21 +128,12 @@ struct snd_opl3sa2 {
         struct snd_hwdep *synth;
         struct snd_rawmidi *rmidi;
         struct snd_cs4231 *cs4231;
-#ifdef CONFIG_PNP
-        struct pnp_dev *dev;
-#endif
         unsigned char ctlregs[0x20];
         int ymode;              /* SL added */
         struct snd_kcontrol *master_switch;
         struct snd_kcontrol *master_volume;
-#ifdef CONFIG_PM
-        void (*cs4231_suspend)(struct snd_cs4231 *);
-        void (*cs4231_resume)(struct snd_cs4231 *);
-#endif
 };
 
-static struct snd_card *snd_opl3sa2_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-
 #define PFX     "opl3sa2: "
 
 #ifdef CONFIG_PNP
@@ -539,11 +532,10 @@ static int __init snd_opl3sa2_mixer(struct snd_opl3sa2 *chip)
 #ifdef CONFIG_PM
 static int snd_opl3sa2_suspend(struct snd_card *card, pm_message_t state)
 {
-        struct snd_opl3sa2 *chip = card->pm_private_data;
-
-        snd_pcm_suspend_all(chip->cs4231->pcm); /* stop before saving regs */
-        chip->cs4231_suspend(chip->cs4231);
+        struct snd_opl3sa2 *chip = card->private_data;
 
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+        chip->cs4231->suspend(chip->cs4231);
         /* power down */
         snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
 
@@ -552,7 +544,7 @@ static int snd_opl3sa2_suspend(struct snd_card *card, pm_message_t state)
 
 static int snd_opl3sa2_resume(struct snd_card *card)
 {
-        struct snd_opl3sa2 *chip = card->pm_private_data;
+        struct snd_opl3sa2 *chip = card->private_data;
         int i;
 
         /* power up */
@@ -568,23 +560,20 @@ static int snd_opl3sa2_resume(struct snd_card *card)
                         snd_opl3sa2_write(chip, i, chip->ctlregs[i]);
         }
         /* restore cs4231 */
-        chip->cs4231_resume(chip->cs4231);
+        chip->cs4231->resume(chip->cs4231);
 
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
         return 0;
 }
 #endif /* CONFIG_PM */
 
 #ifdef CONFIG_PNP
 static int __init snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
-                                  struct pnp_dev *pdev,
-                                  int isapnp)
+                                  struct pnp_dev *pdev)
 {
         struct pnp_resource_table * cfg;
         int err;
 
-        if (!isapnp && pnp_device_is_isapnp(pdev))
-                return -ENOENT; /* we have another procedure - card */
-
         cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
         if (!cfg)
                 return -ENOMEM;
@@ -607,7 +596,7 @@ static int __init snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
         if (irq[dev] != SNDRV_AUTO_IRQ)
                 pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
         err = pnp_manual_config_dev(pdev, cfg, 0);
-        if (err < 0 && isapnp)
+        if (err < 0)
                 snd_printk(KERN_ERR "PnP manual resources are invalid, using auto config\n");
         err = pnp_activate_dev(pdev);
         if (err < 0) {
@@ -628,111 +617,47 @@ static int __init snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
         snd_printdd("%sPnP OPL3-SA: control port=0x%lx, dma1=%i, dma2=%i, irq=%i\n",
                 pnp_device_is_pnpbios(pdev) ? "BIOS" : "ISA", port[dev], dma1[dev], dma2[dev], irq[dev]);
         kfree(cfg);
-        chip->dev = pdev;
         return 0;
 }
-
-static int __init snd_opl3sa2_cpnp(int dev, struct snd_opl3sa2 *chip,
-                                   struct pnp_card_link *card,
-                                   const struct pnp_card_device_id *id)
-{
-        struct pnp_dev *pdev;
-        struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
-
-        if (!cfg)
-                return -ENOMEM;
-        pdev = pnp_request_card_device(card, id->devs[0].id, NULL);
-        if (pdev == NULL) {
-                kfree(cfg);
-                return -EBUSY;
-        }
-        return snd_opl3sa2_pnp(dev, chip, pdev, 1);
-}
 #endif /* CONFIG_PNP */
 
-static int snd_opl3sa2_free(struct snd_opl3sa2 *chip)
+static void snd_opl3sa2_free(struct snd_card *card)
 {
+        struct snd_opl3sa2 *chip = card->private_data;
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void *)chip);
         release_and_free_resource(chip->res_port);
-        kfree(chip);
-        return 0;
 }
 
-static int snd_opl3sa2_dev_free(struct snd_device *device)
+static struct snd_card *snd_opl3sa2_card_new(int dev)
 {
-        struct snd_opl3sa2 *chip = device->device_data;
-        return snd_opl3sa2_free(chip);
-}
-
-#ifdef CONFIG_PNP
-#define is_isapnp_selected(dev)         isapnp[dev]
-#else
-#define is_isapnp_selected(dev)         0
-#endif
-
-static int __devinit snd_opl3sa2_probe(int dev,
-                                       struct pnp_dev *pdev,
-                                       struct pnp_card_link *pcard,
-                                       const struct pnp_card_device_id *pid)
-{
-        int xirq, xdma1, xdma2;
         struct snd_card *card;
         struct snd_opl3sa2 *chip;
-        struct snd_cs4231 *cs4231;
-        struct snd_opl3 *opl3;
-        static struct snd_device_ops ops = {
-                .dev_free =     snd_opl3sa2_dev_free,
-        };
-        int err;
 
-        if (! is_isapnp_selected(dev)) {
-                if (port[dev] == SNDRV_AUTO_PORT) {
-                        snd_printk(KERN_ERR PFX "specify port\n");
-                        return -EINVAL;
-                }
-                if (wss_port[dev] == SNDRV_AUTO_PORT) {
-                        snd_printk(KERN_ERR PFX "specify wss_port\n");
-                        return -EINVAL;
-                }
-                if (fm_port[dev] == SNDRV_AUTO_PORT) {
-                        snd_printk(KERN_ERR PFX "specify fm_port\n");
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_opl3sa2));