Merge branch 'for-linus' of git://neil.brown.name/md

[~andy/linux] / sound / isa / wavefront / wavefront.c

diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 6f143275e3b32c202d1f2c8388de2f31a3c35532..3a6c6fe1ec4d08bed3ff505e84e7a6a5aa8909c3 100644 (file)
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -19,7 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
@@ -40,7 +39,9 @@ MODULE_SUPPORTED_DEVICE("{{Turtle Beach,Maui/Tropez/Tropez+}}");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;         /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;          /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;     /* Enable this card */
+#ifdef CONFIG_PNP
 static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+#endif
 static long cs4232_pcm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
 static int cs4232_pcm_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,11,12,15 */
 static long cs4232_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
@@ -84,6 +85,7 @@ module_param_array(use_cs4232_midi, bool, NULL, 0444);
 MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)");
 
 #ifdef CONFIG_PNP
+static int isa_registered;
 static int pnp_registered;
 
 static struct pnp_card_device_id snd_wavefront_pnpids[] = {
@@ -101,21 +103,15 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
                   const struct pnp_card_device_id *id)
 {
        struct pnp_dev *pdev;
-       struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
        int err;
 
-       if (!cfg)
-               return -ENOMEM;
-
        /* Check for each logical device. */
 
        /* CS4232 chip (aka "windows sound system") is logical device 0 */
 
        acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL);
-       if (acard->wss == NULL) {
-               kfree(cfg);
+       if (acard->wss == NULL)
                return -EBUSY;
-       }
 
        /* there is a game port at logical device 1, but we ignore it completely */
 
@@ -130,26 +126,20 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
 
        if (use_cs4232_midi[dev]) {
                acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL);
-               if (acard->mpu == NULL) {
-                       kfree(cfg);
+               if (acard->mpu == NULL)
                        return -EBUSY;
-               }
        }
 
        /* The ICS2115 synth is logical device 4 */
 
        acard->synth = pnp_request_card_device(card, id->devs[3].id, NULL);
-       if (acard->synth == NULL) {
-               kfree(cfg);
+       if (acard->synth == NULL)
                return -EBUSY;
-       }
 
        /* PCM/FM initialization */
 
        pdev = acard->wss;
 
-       pnp_init_resource_table(cfg);
-
        /* An interesting note from the Tropez+ FAQ:
 
           Q. [Ports] Why is the base address of the WSS I/O ports off by 4?
@@ -162,23 +152,9 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
 
        */
 
-       if (cs4232_pcm_port[dev] != SNDRV_AUTO_PORT)
-               pnp_resource_change(&cfg->port_resource[0], cs4232_pcm_port[dev], 4);
-       if (fm_port[dev] != SNDRV_AUTO_PORT)
-               pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4);
-       if (dma1[dev] != SNDRV_AUTO_DMA)
-               pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1);
-       if (dma2[dev] != SNDRV_AUTO_DMA)
-               pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1);
-       if (cs4232_pcm_irq[dev] != SNDRV_AUTO_IRQ)
-               pnp_resource_change(&cfg->irq_resource[0], cs4232_pcm_irq[dev], 1);
-
-       if (pnp_manual_config_dev(pdev, cfg, 0) < 0)
-               snd_printk(KERN_ERR "PnP WSS the requested resources are invalid, using auto config\n");
        err = pnp_activate_dev(pdev);
        if (err < 0) {
                snd_printk(KERN_ERR "PnP WSS pnp configure failure\n");
-               kfree(cfg);
                return err;
        }
 
@@ -192,22 +168,9 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
 
        pdev = acard->synth;
        
-       pnp_init_resource_table(cfg);
-
-       if (ics2115_port[dev] != SNDRV_AUTO_PORT) {
-               pnp_resource_change(&cfg->port_resource[0], ics2115_port[dev], 16);
-       }
-               
-       if (ics2115_port[dev] != SNDRV_AUTO_IRQ) {
-               pnp_resource_change(&cfg->irq_resource[0], ics2115_irq[dev], 1);
-       }
-
-       if (pnp_manual_config_dev(pdev, cfg, 0) < 0)
-               snd_printk(KERN_ERR "PnP ICS2115 the requested resources are invalid, using auto config\n");
        err = pnp_activate_dev(pdev);
        if (err < 0) {
                snd_printk(KERN_ERR "PnP ICS2115 pnp configure failure\n");
-               kfree(cfg);
                return err;
        }
 
@@ -223,15 +186,6 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
 
                pdev = acard->mpu;
 
-               pnp_init_resource_table(cfg);
-
-               if (cs4232_mpu_port[dev] != SNDRV_AUTO_PORT)
-                       pnp_resource_change(&cfg->port_resource[0], cs4232_mpu_port[dev], 2);
-               if (cs4232_mpu_irq[dev] != SNDRV_AUTO_IRQ)
-                       pnp_resource_change(&cfg->port_resource[0], cs4232_mpu_irq[dev], 1);
-
-               if (pnp_manual_config_dev(pdev, cfg, 0) < 0)
-                       snd_printk(KERN_ERR "PnP MPU401 the requested resources are invalid, using auto config\n");
                err = pnp_activate_dev(pdev);
                if (err < 0) {
                        snd_printk(KERN_ERR "PnP MPU401 pnp configure failure\n");
@@ -255,7 +209,6 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
                    ics2115_port[dev], 
                    ics2115_irq[dev]);
        
-       kfree(cfg);
        return 0;
 }
 
@@ -633,7 +586,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr,
        return 0;
 }
 
-#define WAVEFRONT_DRIVER       "snd_wavefront"
+#define DEV_NAME "wavefront"
 
 static struct isa_driver snd_wavefront_driver = {
        .match          = snd_wavefront_isa_match,
@@ -641,7 +594,7 @@ static struct isa_driver snd_wavefront_driver = {
        .remove         = __devexit_p(snd_wavefront_isa_remove),
        /* FIXME: suspend, resume */
        .driver         = {
-               .name   = WAVEFRONT_DRIVER
+               .name   = DEV_NAME
        },
 };
 
@@ -704,14 +657,18 @@ static int __init alsa_card_wavefront_init(void)
        int err;
 
        err = isa_register_driver(&snd_wavefront_driver, SNDRV_CARDS);
-       if (err < 0)
-               return err;
 #ifdef CONFIG_PNP
+       if (!err)
+               isa_registered = 1;
+
        err = pnp_register_card_driver(&wavefront_pnpc_driver);
        if (!err)
                pnp_registered = 1;
+
+       if (isa_registered)
+               err = 0;
 #endif
-       return 0;
+       return err;
 }
 
 static void __exit alsa_card_wavefront_exit(void)
@@ -719,8 +676,9 @@ static void __exit alsa_card_wavefront_exit(void)
 #ifdef CONFIG_PNP
        if (pnp_registered)
                pnp_unregister_card_driver(&wavefront_pnpc_driver);
+       if (isa_registered)
 #endif
-       isa_unregister_driver(&snd_wavefront_driver);
+               isa_unregister_driver(&snd_wavefront_driver);
 }
 
 module_init(alsa_card_wavefront_init)