[ALSA] sound/isa: kill pnp_resource_change

This removes the pnp_resource_change use from the ALSA ISAPnP drivers. In
2.4 these were useful in providing an easy path to setting the resources,
but in 2.6 they retain function as a layering violation only.
This makes for a nice cleanup (-550 lines) of ALSA but moreover, ALSA is the
only remaining user of pnp_init_resource_table(), pnp_resource_change() and
pnp_manual_config_dev() (and, in fact, of 'struct pnp_resource_table') in
the tree outide of drivers/pnp itself meaning it makes for more cleanup
potential inside the PnP layer.
Thomas Renninger acked their removal from that side, you did from the ALSA
side (CC list just copied from that thread).
Against current alsa-kernel HG. Many more potential cleanups in there, but
this _only_ removes the pnp_resource_change code. Compile tested against
current alsa-kernel HG and compile- and use-tested against 2.6.23.x (few
offsets).
Cc: Thomas Renninger <trenn@suse.de>

Signed-off-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 5 insertions, 48 deletions

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index fc88a31da6f5..994bc85376c1 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -61,20 +61,6 @@ module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for ad1816a based soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable ad1816a based soundcard.");
-module_param_array(port, long, NULL, 0444);
-MODULE_PARM_DESC(port, "Port # for ad1816a driver.");
-module_param_array(mpu_port, long, NULL, 0444);
-MODULE_PARM_DESC(mpu_port, "MPU-401 port # for ad1816a driver.");
-module_param_array(fm_port, long, NULL, 0444);
-MODULE_PARM_DESC(fm_port, "FM port # for ad1816a driver.");
-module_param_array(irq, int, NULL, 0444);
-MODULE_PARM_DESC(irq, "IRQ # for ad1816a driver.");
-module_param_array(mpu_irq, int, NULL, 0444);
-MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for ad1816a driver.");
-module_param_array(dma1, int, NULL, 0444);
-MODULE_PARM_DESC(dma1, "1st DMA # for ad1816a driver.");
-module_param_array(dma2, int, NULL, 0444);
-MODULE_PARM_DESC(dma2, "2nd DMA # for ad1816a driver.");
 module_param_array(clockfreq, int, NULL, 0444);
 MODULE_PARM_DESC(clockfreq, "Clock frequency for ad1816a driver (default = 0).");
 
@@ -117,16 +103,12 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar
                                           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 -EBUSY;
-        }
+
         acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL);
         if (acard->devmpu == NULL) {
                 mpu_port[dev] = -1;
@@ -134,25 +116,10 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar
         }
 
         pdev = acard->dev;
-        pnp_init_resource_table(cfg);
-
-        if (port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[2], port[dev], 16);
-        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 (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) {
                 printk(KERN_ERR PFX "AUDIO PnP configure failure\n");
-                kfree(cfg);
                 return -EBUSY;
         }
 
@@ -162,20 +129,11 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar
         dma2[dev] = pnp_dma(pdev, 1);
         irq[dev] = pnp_irq(pdev, 0);
 
-        if (acard->devmpu == NULL) {
-                kfree(cfg);
+        if (acard->devmpu == NULL)
                 return 0;
-        }
-        pdev = acard->devmpu;
-        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)
-                pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1);
+        pdev = acard->devmpu;
 
-        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) {
                 printk(KERN_ERR PFX "MPU401 PnP configure failure\n");
@@ -186,7 +144,6 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar
                 mpu_irq[dev] = pnp_irq(pdev, 0);
         }
 
-        kfree(cfg);
         return 0;
 }