x86: vsmp fix x86 vsmp fix is vsmp box cleanup

[sfrench/cifs-2.6.git] / sound / isa / sb / sb16.c

diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index c4ba24bfd27c76d2519ddea091c18d64adf030c6..2c201f78ce50a0abd79238c51d81e8f8b8482952 100644 (file)
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for SoundBlaster 16/AWE32/AWE64 soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <asm/dma.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -44,7 +43,7 @@
 #define PFX "sb16: "
 #endif
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 #ifndef SNDRV_SBAWE
 MODULE_DESCRIPTION("Sound Blaster 16");
@@ -257,44 +256,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 +287,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 +304,6 @@ __wt_error:
                awe_port[dev] = -1;
        }
 #endif
-       kfree(cfg);
        return 0;
 }