1 files changed, 16 insertions, 75 deletions

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 5784b43f4123..0a3fece40f8b 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -270,29 +270,9 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = {
 MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids);
 
 /* WSS initialization */
-static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev,
-                                             struct pnp_resource_table *cfg)
+static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)
 {
-        int err;
-
-        pnp_init_resource_table(cfg);
-        if (port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[0], port[dev], 4);
-        if (fm_port[dev] != SNDRV_AUTO_PORT && fm_port[dev] > 0)
-                pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4);
-        if (sb_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[2], sb_port[dev], 16);
-        if (irq[dev] != SNDRV_AUTO_IRQ)
-                pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
-        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] < 0 ? 4 : dma2[dev], 1);
-        err = pnp_manual_config_dev(pdev, cfg, 0);
-        if (err < 0)
-                snd_printk(KERN_ERR IDENT " WSS PnP manual resources are invalid, using auto config\n");
-        err = pnp_activate_dev(pdev);
-        if (err < 0) {
+        if (pnp_activate_dev(pdev) < 0) {
                 printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n");
                 return -EBUSY;
         }
@@ -311,19 +291,9 @@ static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev,
 }
 
 /* CTRL initialization */
-static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev,
-                                              struct pnp_resource_table *cfg)
+static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
 {
-        int err;
-
-        pnp_init_resource_table(cfg);
-        if (cport[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[0], cport[dev], 8);
-        err = pnp_manual_config_dev(pdev, cfg, 0);
-        if (err < 0)
-                snd_printk(KERN_ERR IDENT " CTRL PnP manual resources are invalid, using auto config\n");
-        err = pnp_activate_dev(pdev);
-        if (err < 0) {
+        if (pnp_activate_dev(pdev) < 0) {
                 printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n");
                 return -EBUSY;
         }
@@ -333,21 +303,9 @@ static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev,
 }
 
 /* MPU initialization */
-static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev,
-                                             struct pnp_resource_table *cfg)
+static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
 {
-        int err;
-
-        pnp_init_resource_table(cfg);
-        if (mpu_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2);
-        if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0)
-                pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1);
-        err = pnp_manual_config_dev(pdev, cfg, 0);
-        if (err < 0)
-                snd_printk(KERN_ERR IDENT " MPU401 PnP manual resources are invalid, using auto config\n");
-        err = pnp_activate_dev(pdev);
-        if (err < 0) {
+        if (pnp_activate_dev(pdev) < 0) {
                 printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");
                 mpu_port[dev] = SNDRV_AUTO_PORT;
                 mpu_irq[dev] = SNDRV_AUTO_IRQ;
@@ -368,15 +326,8 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev,
 static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard,
                                          struct pnp_dev *pdev)
 {
-        struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
-
-        if (!cfg)
-                return -ENOMEM;
-        if (snd_cs423x_pnp_init_wss(dev, acard->wss, cfg) < 0) {
-                kfree(cfg);
+        if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0)
                 return -EBUSY;
-        }
-        kfree(cfg);
         cport[dev] = -1;
         return 0;
 }
@@ -386,43 +337,33 @@ static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard
                                           struct pnp_card_link *card,
                                           const struct pnp_card_device_id *id)
 {
-        struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
-
-        if (!cfg)
-                return -ENOMEM;
-
         acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL);
         if (acard->wss == NULL)
-                goto error;
+                return -EBUSY;
         acard->ctrl = pnp_request_card_device(card, id->devs[1].id, NULL);
         if (acard->ctrl == NULL)
-                goto error;
+                return -EBUSY;
         if (id->devs[2].id[0]) {
                 acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL);
                 if (acard->mpu == NULL)
-                        goto error;
+                        return -EBUSY;
         }
 
         /* WSS initialization */
-        if (snd_cs423x_pnp_init_wss(dev, acard->wss, cfg) < 0)
-                goto error;
+        if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0)
+                return -EBUSY;
 
         /* CTRL initialization */
         if (acard->ctrl && cport[dev] > 0) {
-                if (snd_cs423x_pnp_init_ctrl(dev, acard->ctrl, cfg) < 0)
-                        goto error;
+                if (snd_cs423x_pnp_init_ctrl(dev, acard->ctrl) < 0)
+                        return -EBUSY;
         }
         /* MPU initialization */
         if (acard->mpu && mpu_port[dev] > 0) {
-                if (snd_cs423x_pnp_init_mpu(dev, acard->mpu, cfg) < 0)
-                        goto error;
+                if (snd_cs423x_pnp_init_mpu(dev, acard->mpu) < 0)
+                        return -EBUSY;
         }
-        kfree(cfg);
         return 0;
-
- error:
-        kfree(cfg);
-        return -EBUSY;
 }
 #endif /* CONFIG_PNP */