2 files changed, 4 insertions, 62 deletions

diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index d4b218726ce7..3049692bcc57 100644
--- a/sound/isa/sb/es968.c
+++ b/sound/isa/sb/es968.c
@@ -49,12 +49,6 @@ module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for es968 based soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable es968 based soundcard.");
-module_param_array(port, long, NULL, 0444);
-MODULE_PARM_DESC(port, "Port # for es968 driver.");
-module_param_array(irq, int, NULL, 0444);
-MODULE_PARM_DESC(irq, "IRQ # for es968 driver.");
-module_param_array(dma8, int, NULL, 0444);
-MODULE_PARM_DESC(dma8, "8-bit DMA # for es968 driver.");
 
 struct snd_card_es968 {
         struct pnp_dev *dev;
@@ -86,40 +80,23 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard,
                                         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;
+
         acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
-        if (acard->dev == NULL) {
-                kfree(cfg);
+        if (acard->dev == NULL)
                 return -ENODEV;
-        }
 
         pdev = acard->dev;
 
-        pnp_init_resource_table(cfg);
-
-        /* override resources */
-        if (port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[0], port[dev], 16);
-        if (dma8[dev] != SNDRV_AUTO_DMA)
-                pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1);
-        if (irq[dev] != SNDRV_AUTO_IRQ)
-                pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
-        if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0)
-                snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n");
         err = pnp_activate_dev(pdev);
         if (err < 0) {
                 snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n");
-                kfree(cfg);
                 return err;
         }
         port[dev] = pnp_port_start(pdev, 0);
         dma8[dev] = pnp_dma(pdev, 1);
         irq[dev] = pnp_irq(pdev, 0);
 
-        kfree(cfg);
         return 0;
 }
 
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index e7f9edd92626..8e1aff77b900 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -257,44 +257,21 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
                                        const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
-        struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
         int err;
 
-        if (!cfg) 
-                return -ENOMEM; 
         acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
-        if (acard->dev == NULL) { 
-                kfree(cfg); 
+        if (acard->dev == NULL)
                 return -ENODEV; 
-        } 
+
 #ifdef SNDRV_SBAWE_EMU8000
         acard->devwt = pnp_request_card_device(card, id->devs[1].id, acard->dev);
 #endif
         /* Audio initialization */
         pdev = acard->dev;
 
-        pnp_init_resource_table(cfg); 
-         
-        /* override resources */ 
-
-        if (port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[0], port[dev], 16);
-        if (mpu_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[1], mpu_port[dev], 2);
-        if (fm_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[2], fm_port[dev], 4);
-        if (dma8[dev] != SNDRV_AUTO_DMA)
-                pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1);
-        if (dma16[dev] != SNDRV_AUTO_DMA)
-                pnp_resource_change(&cfg->dma_resource[1], dma16[dev], 1);
-        if (irq[dev] != SNDRV_AUTO_IRQ)
-                pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
-        if (pnp_manual_config_dev(pdev, cfg, 0) < 0) 
-                snd_printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n"); 
         err = pnp_activate_dev(pdev); 
         if (err < 0) { 
                 snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n"); 
-                kfree(cfg);
                 return err; 
         } 
         port[dev] = pnp_port_start(pdev, 0);
@@ -311,17 +288,6 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
         /* WaveTable initialization */
         pdev = acard->devwt;
         if (pdev != NULL) {
-                pnp_init_resource_table(cfg); 
-         
-                /* override resources */ 
-
-                if (awe_port[dev] != SNDRV_AUTO_PORT) {
-                        pnp_resource_change(&cfg->port_resource[0], awe_port[dev], 4);
-                        pnp_resource_change(&cfg->port_resource[1], awe_port[dev] + 0x400, 4);
-                        pnp_resource_change(&cfg->port_resource[2], awe_port[dev] + 0x800, 4);
-                }
-                if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0) 
-                        snd_printk(KERN_ERR PFX "WaveTable the requested resources are invalid, using auto config\n"); 
                 err = pnp_activate_dev(pdev); 
                 if (err < 0) { 
                         goto __wt_error; 
@@ -339,7 +305,6 @@ __wt_error:
                 awe_port[dev] = -1;
         }
 #endif
-        kfree(cfg);
         return 0;
 }