Commit 2973ee4a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: opti9xx: Allocate resources with device-managed APIs 

This patch converts the resource management in ISA als100 driver with
devres as a clean up.  Each manual resource management is converted
with the corresponding devres helper.

This should give no user-visible functional changes.

Link: https://lore.kernel.org/r/20210715075941.23332-68-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 09849304

sound/isa/opti9xx/miro.c

+21 −55
Original line number Diff line number Diff line
@@ -1159,12 +1159,13 @@ static int snd_miro_configure(struct snd_miro *chip) 
	return 0;

}



static int snd_miro_opti_check(struct snd_miro *chip)

static int snd_miro_opti_check(struct snd_card *card, struct snd_miro *chip)

{

	unsigned char value;



	chip->res_mc_base = request_region(chip->mc_base, chip->mc_base_size,

					   "OPTi9xx MC");

	chip->res_mc_base =

		devm_request_region(card->dev, chip->mc_base,

				    chip->mc_base_size, "OPTi9xx MC");

	if (chip->res_mc_base == NULL)

		return -ENOMEM;
@@ -1173,7 +1174,7 @@ static int snd_miro_opti_check(struct snd_miro *chip) 
		if (value == snd_miro_read(chip, OPTi9XX_MC_REG(1)))

			return 0;



	release_and_free_resource(chip->res_mc_base);

	devm_release_resource(card->dev, chip->res_mc_base);

	chip->res_mc_base = NULL;



	return -ENODEV;
@@ -1190,7 +1191,7 @@ static int snd_card_miro_detect(struct snd_card *card, 
		if (err < 0)

			return err;



		err = snd_miro_opti_check(chip);

		err = snd_miro_opti_check(card, chip);

		if (err == 0)

			return 1;

	}
@@ -1214,7 +1215,8 @@ static int snd_card_miro_aci_detect(struct snd_card *card, 
	regval=inb(miro->mc_base + 4);

	aci->aci_port = (regval & 0x10) ? 0x344 : 0x354;



	miro->res_aci_port = request_region(aci->aci_port, 3, "miro aci");

	miro->res_aci_port =

		devm_request_region(card->dev, aci->aci_port, 3, "miro aci");

	if (miro->res_aci_port == NULL) {

		snd_printk(KERN_ERR "aci i/o area 0x%lx-0x%lx already used.\n", 

			   aci->aci_port, aci->aci_port+2);
@@ -1253,16 +1255,6 @@ static int snd_card_miro_aci_detect(struct snd_card *card, 
	return 0;

}



static void snd_card_miro_free(struct snd_card *card)

{

	struct snd_miro *miro = card->private_data;



	release_and_free_resource(miro->res_aci_port);

	if (miro->aci)

		miro->aci->aci_port = 0;

	release_and_free_resource(miro->res_mc_base);

}



static int snd_miro_probe(struct snd_card *card)

{

	int error;
@@ -1271,7 +1263,8 @@ static int snd_miro_probe(struct snd_card *card) 
	struct snd_rawmidi *rmidi;



	if (!miro->res_mc_base) {

		miro->res_mc_base = request_region(miro->mc_base,

		miro->res_mc_base = devm_request_region(card->dev,

							miro->mc_base,

							miro->mc_base_size,

							"miro (OPTi9xx MC)");

		if (miro->res_mc_base == NULL) {
@@ -1408,17 +1401,15 @@ static int snd_miro_isa_probe(struct device *devptr, unsigned int n) 
	struct snd_miro *miro;

	struct snd_card *card;



	error = snd_card_new(devptr, index, id, THIS_MODULE,

	error = snd_devm_card_new(devptr, index, id, THIS_MODULE,

				  sizeof(struct snd_miro), &card);

	if (error < 0)

		return error;



	card->private_free = snd_card_miro_free;

	miro = card->private_data;



	error = snd_card_miro_detect(card, miro);

	if (error < 0) {

		snd_card_free(card);

		snd_printk(KERN_ERR "unable to detect OPTi9xx chip\n");

		return -ENODEV;

	}
@@ -1426,7 +1417,6 @@ static int snd_miro_isa_probe(struct device *devptr, unsigned int n) 
	if (port == SNDRV_AUTO_PORT) {

		port = snd_legacy_find_free_ioport(possible_ports, 4);

		if (port < 0) {

			snd_card_free(card);

			snd_printk(KERN_ERR "unable to find a free WSS port\n");

			return -EBUSY;

		}
@@ -1435,7 +1425,6 @@ static int snd_miro_isa_probe(struct device *devptr, unsigned int n) 
	if (mpu_port == SNDRV_AUTO_PORT) {

		mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2);

		if (mpu_port < 0) {

			snd_card_free(card);

			snd_printk(KERN_ERR

				   "unable to find a free MPU401 port\n");

			return -EBUSY;
@@ -1445,7 +1434,6 @@ static int snd_miro_isa_probe(struct device *devptr, unsigned int n) 
	if (irq == SNDRV_AUTO_IRQ) {

		irq = snd_legacy_find_free_irq(possible_irqs);

		if (irq < 0) {

			snd_card_free(card);

			snd_printk(KERN_ERR "unable to find a free IRQ\n");

			return -EBUSY;

		}
@@ -1453,7 +1441,6 @@ static int snd_miro_isa_probe(struct device *devptr, unsigned int n) 
	if (mpu_irq == SNDRV_AUTO_IRQ) {

		mpu_irq = snd_legacy_find_free_irq(possible_mpu_irqs);

		if (mpu_irq < 0) {

			snd_card_free(card);

			snd_printk(KERN_ERR

				   "unable to find a free MPU401 IRQ\n");

			return -EBUSY;
@@ -1462,7 +1449,6 @@ static int snd_miro_isa_probe(struct device *devptr, unsigned int n) 
	if (dma1 == SNDRV_AUTO_DMA) {

		dma1 = snd_legacy_find_free_dma(possible_dma1s);

		if (dma1 < 0) {

			snd_card_free(card);

			snd_printk(KERN_ERR "unable to find a free DMA1\n");

			return -EBUSY;

		}
@@ -1470,34 +1456,24 @@ static int snd_miro_isa_probe(struct device *devptr, unsigned int n) 
	if (dma2 == SNDRV_AUTO_DMA) {

		dma2 = snd_legacy_find_free_dma(possible_dma2s[dma1 % 4]);

		if (dma2 < 0) {

			snd_card_free(card);

			snd_printk(KERN_ERR "unable to find a free DMA2\n");

			return -EBUSY;

		}

	}



	error = snd_miro_probe(card);

	if (error < 0) {

		snd_card_free(card);

	if (error < 0)

		return error;

	}



	dev_set_drvdata(devptr, card);

	return 0;

}



static void snd_miro_isa_remove(struct device *devptr,

			       unsigned int dev)

{

	snd_card_free(dev_get_drvdata(devptr));

}



#define DEV_NAME "miro"



static struct isa_driver snd_miro_driver = {

	.match		= snd_miro_isa_match,

	.probe		= snd_miro_isa_probe,

	.remove		= snd_miro_isa_remove,

	/* FIXME: suspend/resume */

	.driver		= {

		.name	= DEV_NAME
@@ -1578,39 +1554,31 @@ static int snd_miro_pnp_probe(struct pnp_card_link *pcard, 
		return -EBUSY;

	if (!isapnp)

		return -ENODEV;

	err = snd_card_new(&pcard->card->dev, index, id, THIS_MODULE,

	err = snd_devm_card_new(&pcard->card->dev, index, id, THIS_MODULE,

				sizeof(struct snd_miro), &card);

	if (err < 0)

		return err;



	card->private_free = snd_card_miro_free;

	miro = card->private_data;



	err = snd_card_miro_pnp(miro, pcard, pid);

	if (err) {

		snd_card_free(card);

	if (err)

		return err;

	}



	/* only miroSOUND PCM20 and PCM12 == OPTi924 */

	err = snd_miro_init(miro, OPTi9XX_HW_82C924);

	if (err) {

		snd_card_free(card);

	if (err)

		return err;

	}



	err = snd_miro_opti_check(miro);

	err = snd_miro_opti_check(card, miro);

	if (err) {

		snd_printk(KERN_ERR "OPTI chip not found\n");

		snd_card_free(card);

		return err;

	}



	err = snd_miro_probe(card);

	if (err < 0) {

		snd_card_free(card);

	if (err < 0)

		return err;

	}

	pnp_set_card_drvdata(pcard, card);

	snd_miro_pnp_is_probed = 1;

	return 0;
@@ -1618,8 +1586,6 @@ static int snd_miro_pnp_probe(struct pnp_card_link *pcard, 


static void snd_miro_pnp_remove(struct pnp_card_link *pcard)

{

	snd_card_free(pnp_get_card_drvdata(pcard));

	pnp_set_card_drvdata(pcard, NULL);

	snd_miro_pnp_is_probed = 0;

}

sound/isa/opti9xx/opti92x-ad1848.c

+23 −57
Original line number Diff line number Diff line
@@ -654,16 +654,18 @@ static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id) 


#endif /* OPTi93X */



static int snd_opti9xx_read_check(struct snd_opti9xx *chip)

static int snd_opti9xx_read_check(struct snd_card *card,

				  struct snd_opti9xx *chip)

{

	unsigned char value;

#ifdef OPTi93X

	unsigned long flags;

#endif



	chip->res_mc_base = request_region(chip->mc_base, chip->mc_base_size,

					   "OPTi9xx MC");

	if (chip->res_mc_base == NULL)

	chip->res_mc_base =

		devm_request_region(card->dev, chip->mc_base,

				    chip->mc_base_size, "OPTi9xx MC");

	if (!chip->res_mc_base)

		return -EBUSY;

#ifndef OPTi93X

	value = snd_opti9xx_read(chip, OPTi9XX_MC_REG(1));
@@ -671,9 +673,10 @@ static int snd_opti9xx_read_check(struct snd_opti9xx *chip) 
		if (value == snd_opti9xx_read(chip, OPTi9XX_MC_REG(1)))

			return 0;

#else	/* OPTi93X */

	chip->res_mc_indir = request_region(chip->mc_indir_index, 2,

	chip->res_mc_indir =

		devm_request_region(card->dev, chip->mc_indir_index, 2,

				    "OPTi93x MC");

	if (chip->res_mc_indir == NULL)

	if (!chip->res_mc_indir)

		return -EBUSY;



	spin_lock_irqsave(&chip->lock, flags);
@@ -686,10 +689,10 @@ static int snd_opti9xx_read_check(struct snd_opti9xx *chip) 
	if (snd_opti9xx_read(chip, OPTi9XX_MC_REG(7)) == 0xff - value)

		return 0;



	release_and_free_resource(chip->res_mc_indir);

	devm_release_resource(card->dev, chip->res_mc_indir);

	chip->res_mc_indir = NULL;

#endif	/* OPTi93X */

	release_and_free_resource(chip->res_mc_base);

	devm_release_resource(card->dev, chip->res_mc_base);

	chip->res_mc_base = NULL;



	return -ENODEV;
@@ -709,7 +712,7 @@ static int snd_card_opti9xx_detect(struct snd_card *card, 
		if (err < 0)

			return err;



		err = snd_opti9xx_read_check(chip);

		err = snd_opti9xx_read_check(card, chip);

		if (err == 0)

			return 1;

#ifdef OPTi93X
@@ -789,22 +792,6 @@ static int snd_card_opti9xx_pnp(struct snd_opti9xx *chip, 
}

#endif	/* CONFIG_PNP */



static void snd_card_opti9xx_free(struct snd_card *card)

{

	struct snd_opti9xx *chip = card->private_data;



	if (chip) {

#ifdef OPTi93X

		if (chip->irq > 0) {

			disable_irq(chip->irq);

			free_irq(chip->irq, chip);

		}

		release_and_free_resource(chip->res_mc_indir);

#endif

		release_and_free_resource(chip->res_mc_base);

	}

}



static int snd_opti9xx_probe(struct snd_card *card)

{

	static const long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
@@ -860,7 +847,7 @@ static int snd_opti9xx_probe(struct snd_card *card) 
		return error;

#endif

#ifdef OPTi93X

	error = request_irq(irq, snd_opti93x_interrupt,

	error = devm_request_irq(card->dev, irq, snd_opti93x_interrupt,

				 0, DEV_NAME" - WSS", chip);

	if (error < 0) {

		snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", irq);
@@ -931,11 +918,10 @@ static int snd_opti9xx_card_new(struct device *pdev, struct snd_card **cardp) 
	struct snd_card *card;

	int err;



	err = snd_card_new(pdev, index, id, THIS_MODULE,

	err = snd_devm_card_new(pdev, index, id, THIS_MODULE,

				sizeof(struct snd_opti9xx), &card);

	if (err < 0)

		return err;

	card->private_free = snd_card_opti9xx_free;

	*cardp = card;

	return 0;

}
@@ -1012,25 +998,15 @@ static int snd_opti9xx_isa_probe(struct device *devptr, 
		return error;



	error = snd_card_opti9xx_detect(card, card->private_data);

	if (error < 0) {

		snd_card_free(card);

	if (error < 0)

		return error;

	}

	error = snd_opti9xx_probe(card);

	if (error < 0) {

		snd_card_free(card);

	if (error < 0)

		return error;

	}

	dev_set_drvdata(devptr, card);

	return 0;

}



static void snd_opti9xx_isa_remove(struct device *devptr,

				   unsigned int dev)

{

	snd_card_free(dev_get_drvdata(devptr));

}



#ifdef CONFIG_PM

static int snd_opti9xx_suspend(struct snd_card *card)

{
@@ -1075,7 +1051,6 @@ static int snd_opti9xx_isa_resume(struct device *dev, unsigned int n) 
static struct isa_driver snd_opti9xx_driver = {

	.match		= snd_opti9xx_isa_match,

	.probe		= snd_opti9xx_isa_probe,

	.remove		= snd_opti9xx_isa_remove,

#ifdef CONFIG_PM

	.suspend	= snd_opti9xx_isa_suspend,

	.resume		= snd_opti9xx_isa_resume,
@@ -1114,26 +1089,19 @@ static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, 
		hw = OPTi9XX_HW_82C931;

		break;

	default:

		snd_card_free(card);

		return -ENODEV;

	}



	error = snd_opti9xx_init(chip, hw);

	if (error) {

		snd_card_free(card);

	if (error)

		return error;

	}

	error = snd_opti9xx_read_check(chip);

	if (error) {

	error = snd_opti9xx_read_check(card, chip);

	if (error)

		snd_printk(KERN_ERR "OPTI chip not found\n");

		snd_card_free(card);

		return error;

	}

	error = snd_opti9xx_probe(card);

	if (error < 0) {

		snd_card_free(card);

	if (error < 0)

		return error;

	}

	pnp_set_card_drvdata(pcard, card);

	snd_opti9xx_pnp_is_probed = 1;

	return 0;
@@ -1141,8 +1109,6 @@ static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, 


static void snd_opti9xx_pnp_remove(struct pnp_card_link *pcard)

{

	snd_card_free(pnp_get_card_drvdata(pcard));

	pnp_set_card_drvdata(pcard, NULL);

	snd_opti9xx_pnp_is_probed = 0;

}