Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 109c53f8 authored by Rene Herman's avatar Rene Herman Committed by Jaroslav Kysela
Browse files

[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: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent df1deb67

Documentation/sound/alsa/ALSA-Configuration.txt

+0 −35
Original line number Diff line number Diff line
@@ -150,13 +150,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Module for sound cards based on Analog Devices AD1816A/AD1815 ISA chips.



    port	- port # for AD1816A chip (PnP setup)

    mpu_port	- port # for MPU-401 UART (PnP setup)

    fm_port	- port # for OPL3 (PnP setup)

    irq		- IRQ # for AD1816A chip (PnP setup)

    mpu_irq	- IRQ # for MPU-401 UART (PnP setup)

    dma1	- first DMA # for AD1816A chip (PnP setup)

    dma2	- second DMA # for AD1816A chip (PnP setup)

    clockfreq   - Clock frequency for AD1816A chip (default = 0, 33000Hz)

    

    This module supports multiple cards, autoprobe and PnP.
@@ -203,14 +196,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Module for sound cards based on Avance Logic ALS100/ALS120 ISA chips.



    port	- port # for ALS100 (SB16) chip (PnP setup)

    irq		- IRQ # for ALS100 (SB16) chip (PnP setup)

    dma8	- 8-bit DMA # for ALS100 (SB16) chip (PnP setup)

    dma16	- 16-bit DMA # for ALS100 (SB16) chip (PnP setup)

    mpu_port	- port # for MPU-401 UART (PnP setup)

    mpu_irq	- IRQ # for MPU-401 (PnP setup)

    fm_port	- port # for OPL3 FM (PnP setup)

    

    This module supports multiple cards, autoprobe and PnP.



    The power-management is supported.
@@ -304,15 +289,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Module for sound cards based on Aztech System AZT2320 ISA chip (PnP only).



    port	- port # for AZT2320 chip (PnP setup)

    wss_port	- port # for WSS (PnP setup)

    mpu_port	- port # for MPU-401 UART (PnP setup)

    fm_port	- FM port # for AZT2320 chip (PnP setup)

    irq		- IRQ # for AZT2320 (WSS) chip (PnP setup)

    mpu_irq	- IRQ # for MPU-401 UART (PnP setup)

    dma1	- 1st DMA # for AZT2320 (WSS) chip (PnP setup)

    dma2	- 2nd DMA # for AZT2320 (WSS) chip (PnP setup)

    

    This module supports multiple cards, PnP and autoprobe.

    

    The power-management is supported.
@@ -505,13 +481,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    Module for Diamond Technologies DT-019X / Avance Logic ALS-007 (PnP

    only)



    port	- Port # (PnP setup)

    mpu_port	- Port # for MPU-401 (PnP setup)

    fm_port	- Port # for FM OPL-3 (PnP setup)

    irq		- IRQ # (PnP setup)

    mpu_irq	- IRQ # for MPU-401 (PnP setup)

    dma8	- DMA # (PnP setup)



    This module supports multiple cards.  This module is enabled only with

    ISA PnP support.
@@ -609,10 +578,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Module for sound cards based on ESS ES968 chip (PnP only).



    port	- port # for ES968 (SB8) chip (PnP setup)

    irq		- IRQ # for ES968 (SB8) chip (PnP setup)

    dma1	- DMA # for ES968 (SB8) chip (PnP setup)

    

    This module supports multiple cards, PnP and autoprobe.

    

    The power-management is supported.

sound/isa/ad1816a/ad1816a.c

+5 −48
Original line number Diff line number Diff line
@@ -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;

}

sound/isa/als100.c

+2 −47
Original line number Diff line number Diff line
@@ -63,20 +63,6 @@ module_param_array(id, charp, NULL, 0444); 
MODULE_PARM_DESC(id, "ID string for als100 based soundcard.");

module_param_array(enable, bool, NULL, 0444);

MODULE_PARM_DESC(enable, "Enable als100 based soundcard.");

module_param_array(port, long, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for als100 driver.");

module_param_array(mpu_port, long, NULL, 0444);

MODULE_PARM_DESC(mpu_port, "MPU-401 port # for als100 driver.");

module_param_array(fm_port, long, NULL, 0444);

MODULE_PARM_DESC(fm_port, "FM port # for als100 driver.");

module_param_array(irq, int, NULL, 0444);

MODULE_PARM_DESC(irq, "IRQ # for als100 driver.");

module_param_array(mpu_irq, int, NULL, 0444);

MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for als100 driver.");

module_param_array(dma8, int, NULL, 0444);

MODULE_PARM_DESC(dma8, "8-bit DMA # for als100 driver.");

module_param_array(dma16, int, NULL, 0444);

MODULE_PARM_DESC(dma16, "16-bit DMA # for als100 driver.");



struct snd_card_als100 {

	int dev_no;
@@ -111,38 +97,20 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *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;

	}



	acard->devmpu = pnp_request_card_device(card, id->devs[1].id, acard->dev);

	acard->devopl = pnp_request_card_device(card, id->devs[2].id, acard->dev);



	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 (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);
@@ -152,13 +120,6 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard, 


	pdev = acard->devmpu;

	if (pdev != NULL) {

		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);

		if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0)

			snd_printk(KERN_ERR PFX "MPU401 the requested resources are invalid, using auto config\n");

		err = pnp_activate_dev(pdev);

		if (err < 0)

			goto __mpu_error;
@@ -176,11 +137,6 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard, 


	pdev = acard->devopl;

	if (pdev != NULL) {

		pnp_init_resource_table(cfg);

		if (fm_port[dev] != SNDRV_AUTO_PORT)

			pnp_resource_change(&cfg->port_resource[0], fm_port[dev], 4);

		if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0)

			snd_printk(KERN_ERR PFX "OPL3 the requested resources are invalid, using auto config\n");

		err = pnp_activate_dev(pdev);

		if (err < 0)

			goto __fm_error;
@@ -195,7 +151,6 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard, 
	     	fm_port[dev] = -1;

	}



	kfree(cfg);

	return 0;

}

sound/isa/azt2320.c

+1 −49
Original line number Diff line number Diff line
@@ -72,22 +72,6 @@ module_param_array(id, charp, NULL, 0444); 
MODULE_PARM_DESC(id, "ID string for azt2320 based soundcard.");

module_param_array(enable, bool, NULL, 0444);

MODULE_PARM_DESC(enable, "Enable azt2320 based soundcard.");

module_param_array(port, long, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for azt2320 driver.");

module_param_array(wss_port, long, NULL, 0444);

MODULE_PARM_DESC(wss_port, "WSS Port # for azt2320 driver.");

module_param_array(mpu_port, long, NULL, 0444);

MODULE_PARM_DESC(mpu_port, "MPU-401 port # for azt2320 driver.");

module_param_array(fm_port, long, NULL, 0444);

MODULE_PARM_DESC(fm_port, "FM port # for azt2320 driver.");

module_param_array(irq, int, NULL, 0444);

MODULE_PARM_DESC(irq, "IRQ # for azt2320 driver.");

module_param_array(mpu_irq, int, NULL, 0444);

MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for azt2320 driver.");

module_param_array(dma1, int, NULL, 0444);

MODULE_PARM_DESC(dma1, "1st DMA # for azt2320 driver.");

module_param_array(dma2, int, NULL, 0444);

MODULE_PARM_DESC(dma2, "2nd DMA # for azt2320 driver.");



struct snd_card_azt2320 {

	int dev_no;
@@ -121,43 +105,19 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar 
					  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;

	}



	acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL);



	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 (fm_port[dev] != SNDRV_AUTO_PORT)

		pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4);

	if (wss_port[dev] != SNDRV_AUTO_PORT)

		pnp_resource_change(&cfg->port_resource[2], wss_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) {

		snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n");

		kfree(cfg);

		return err;

	}

	port[dev] = pnp_port_start(pdev, 0);
@@ -169,13 +129,6 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar 


	pdev = acard->devmpu;

	if (pdev != NULL) {

		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);

		if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0)

			snd_printk(KERN_ERR PFX "MPU401 the requested resources are invalid, using auto config\n");

		err = pnp_activate_dev(pdev);

		if (err < 0)

			goto __mpu_error;
@@ -191,7 +144,6 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar 
	     	mpu_port[dev] = -1;

	}



	kfree (cfg);

	return 0;

}

sound/isa/cmi8330.c

+5 −37
Original line number Diff line number Diff line
@@ -286,39 +286,21 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *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->cap = pnp_request_card_device(card, id->devs[0].id, NULL);

	if (acard->cap == NULL) {

		kfree(cfg);

	if (acard->cap == NULL)

		return -EBUSY;

	}



	acard->play = pnp_request_card_device(card, id->devs[1].id, NULL);

	if (acard->play == NULL) {

		kfree(cfg);

	if (acard->play == NULL)

		return -EBUSY;

	}



	pdev = acard->cap;

	pnp_init_resource_table(cfg);

	/* allocate AD1848 resources */

	if (wssport[dev] != SNDRV_AUTO_PORT)

		pnp_resource_change(&cfg->port_resource[0], wssport[dev], 8);

	if (wssdma[dev] != SNDRV_AUTO_DMA)

		pnp_resource_change(&cfg->dma_resource[0], wssdma[dev], 1);

	if (wssirq[dev] != SNDRV_AUTO_IRQ)

		pnp_resource_change(&cfg->irq_resource[0], wssirq[dev], 1);



	err = pnp_manual_config_dev(pdev, cfg, 0);

	if (err < 0)

		snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP manual resources are invalid, using auto config\n");



	err = pnp_activate_dev(pdev);

	if (err < 0) {

		snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP configure failure\n");

		kfree(cfg);

		return -EBUSY;

	}

	wssport[dev] = pnp_port_start(pdev, 0);
@@ -327,23 +309,10 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, 


	/* allocate SB16 resources */

	pdev = acard->play;

	pnp_init_resource_table(cfg);

	if (sbport[dev] != SNDRV_AUTO_PORT)

		pnp_resource_change(&cfg->port_resource[0], sbport[dev], 16);

	if (sbdma8[dev] != SNDRV_AUTO_DMA)

		pnp_resource_change(&cfg->dma_resource[0], sbdma8[dev], 1);

	if (sbdma16[dev] != SNDRV_AUTO_DMA)

		pnp_resource_change(&cfg->dma_resource[1], sbdma16[dev], 1);

	if (sbirq[dev] != SNDRV_AUTO_IRQ)

		pnp_resource_change(&cfg->irq_resource[0], sbirq[dev], 1);



	err = pnp_manual_config_dev(pdev, cfg, 0);

	if (err < 0)

		snd_printk(KERN_ERR "CMI8330/C3D (SB16) PnP manual resources are invalid, using auto config\n");



	err = pnp_activate_dev(pdev);

	if (err < 0) {

		snd_printk(KERN_ERR "CMI8330/C3D (SB16) PnP configure failure\n");

		kfree(cfg);

		return -EBUSY;

	}

	sbport[dev] = pnp_port_start(pdev, 0);
@@ -351,7 +320,6 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, 
	sbdma16[dev] = pnp_dma(pdev, 1);

	sbirq[dev] = pnp_irq(pdev, 0);



	kfree(cfg);

	return 0;

}

#endif