Commit 33631012 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: aw2: Allocate resources with device-managed APIs 

This patch converts the resource management in PCI aw2 driver with
devres as a clean up.  Each manual resource management is converted
with the corresponding devres helper, and the card object release is
managed now via card->private_free instead of a lowlevel snd_device.

This should give no user-visible functional changes.

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


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

sound/pci/aw2/aw2-alsa.c

+18 −84
Original line number Diff line number Diff line
@@ -99,12 +99,9 @@ struct aw2 { 
/*********************************

 * FUNCTION DECLARATIONS

 ********************************/

static int snd_aw2_dev_free(struct snd_device *device);

static int snd_aw2_create(struct snd_card *card,

			  struct pci_dev *pci, struct aw2 **rchip);

static int snd_aw2_create(struct snd_card *card, struct pci_dev *pci);

static int snd_aw2_probe(struct pci_dev *pci,

			 const struct pci_device_id *pci_id);

static void snd_aw2_remove(struct pci_dev *pci);

static int snd_aw2_pcm_playback_open(struct snd_pcm_substream *substream);

static int snd_aw2_pcm_playback_close(struct snd_pcm_substream *substream);

static int snd_aw2_pcm_capture_open(struct snd_pcm_substream *substream);
@@ -157,7 +154,6 @@ static struct pci_driver aw2_driver = { 
	.name = KBUILD_MODNAME,

	.id_table = snd_aw2_ids,

	.probe = snd_aw2_probe,

	.remove = snd_aw2_remove,

};



module_pci_driver(aw2_driver);
@@ -196,41 +192,23 @@ static const struct snd_kcontrol_new aw2_control = { 
 ********************************/



/* component-destructor */

static int snd_aw2_dev_free(struct snd_device *device)

static void snd_aw2_free(struct snd_card *card)

{

	struct aw2 *chip = device->device_data;

	struct aw2 *chip = card->private_data;



	/* Free hardware */

	snd_aw2_saa7146_free(&chip->saa7146);



	/* release the irq */

	if (chip->irq >= 0)

		free_irq(chip->irq, (void *)chip);

	/* release the i/o ports & memory */

	iounmap(chip->iobase_virt);

	pci_release_regions(chip->pci);

	/* disable the PCI entry */

	pci_disable_device(chip->pci);

	/* release the data */

	kfree(chip);



	return 0;

}



/* chip-specific constructor */

static int snd_aw2_create(struct snd_card *card,

			  struct pci_dev *pci, struct aw2 **rchip)

			  struct pci_dev *pci)

{

	struct aw2 *chip;

	struct aw2 *chip = card->private_data;

	int err;

	static const struct snd_device_ops ops = {

		.dev_free = snd_aw2_dev_free,

	};



	*rchip = NULL;



	/* initialize the PCI entry */

	err = pci_enable_device(pci);

	err = pcim_enable_device(pci);

	if (err < 0)

		return err;

	pci_set_master(pci);
@@ -238,14 +216,8 @@ static int snd_aw2_create(struct snd_card *card, 
	/* check PCI availability (32bit DMA) */

	if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32))) {

		dev_err(card->dev, "Impossible to set 32bit mask DMA\n");

		pci_disable_device(pci);

		return -ENXIO;

	}

	chip = kzalloc(sizeof(*chip), GFP_KERNEL);

	if (chip == NULL) {

		pci_disable_device(pci);

		return -ENOMEM;

	}



	/* initialize the stuff */

	chip->card = card;
@@ -253,52 +225,23 @@ static int snd_aw2_create(struct snd_card *card, 
	chip->irq = -1;



	/* (1) PCI resource allocation */

	err = pci_request_regions(pci, "Audiowerk2");

	if (err < 0) {

		pci_disable_device(pci);

		kfree(chip);

	err = pcim_iomap_regions(pci, 1 << 0, "Audiowerk2");

	if (err < 0)

		return err;

	}

	chip->iobase_phys = pci_resource_start(pci, 0);

	chip->iobase_virt =

		ioremap(chip->iobase_phys,

				pci_resource_len(pci, 0));



	if (chip->iobase_virt == NULL) {

		dev_err(card->dev, "unable to remap memory region");

		pci_release_regions(pci);

		pci_disable_device(pci);

		kfree(chip);

		return -ENOMEM;

	}

	chip->iobase_virt = pcim_iomap_table(pci)[0];



	/* (2) initialization of the chip hardware */

	snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);



	if (request_irq(pci->irq, snd_aw2_saa7146_interrupt,

	if (devm_request_irq(&pci->dev, pci->irq, snd_aw2_saa7146_interrupt,

			     IRQF_SHARED, KBUILD_MODNAME, chip)) {

		dev_err(card->dev, "Cannot grab irq %d\n", pci->irq);



		iounmap(chip->iobase_virt);

		pci_release_regions(chip->pci);

		pci_disable_device(chip->pci);

		kfree(chip);

		return -EBUSY;

	}

	chip->irq = pci->irq;

	card->sync_irq = chip->irq;



	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);

	if (err < 0) {

		free_irq(chip->irq, (void *)chip);

		iounmap(chip->iobase_virt);

		pci_release_regions(chip->pci);

		pci_disable_device(chip->pci);

		kfree(chip);

		return err;

	}



	*rchip = chip;

	card->private_free = snd_aw2_free;



	dev_info(card->dev,

		 "Audiowerk 2 sound card (saa7146 chipset) detected and managed\n");
@@ -323,17 +266,16 @@ static int snd_aw2_probe(struct pci_dev *pci, 
	}



	/* (2) Create card instance */

	err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,

			   0, &card);

	err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,

				sizeof(*chip), &card);

	if (err < 0)

		return err;

	chip = card->private_data;



	/* (3) Create main component */

	err = snd_aw2_create(card, pci, &chip);

	if (err < 0) {

		snd_card_free(card);

	err = snd_aw2_create(card, pci);

	if (err < 0)

		return err;

	}



	/* initialize mutex */

	mutex_init(&chip->mtx);
@@ -351,10 +293,8 @@ static int snd_aw2_probe(struct pci_dev *pci, 


	/* (6) Register card instance */

	err = snd_card_register(card);

	if (err < 0) {

		snd_card_free(card);

	if (err < 0)

		return err;

	}



	/* (7) Set PCI driver data */

	pci_set_drvdata(pci, card);
@@ -363,12 +303,6 @@ static int snd_aw2_probe(struct pci_dev *pci, 
	return 0;

}



/* destructor */

static void snd_aw2_remove(struct pci_dev *pci)

{

	snd_card_free(pci_get_drvdata(pci));

}



/* open callback */

static int snd_aw2_pcm_playback_open(struct snd_pcm_substream *substream)

{