Commit 24ee07fb authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ali5451: Allocate resources with device-managed APIs 

This patch converts the resource management in PCI ali5451 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-27-tiwai@suse.de


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

sound/pci/ali5451/ali5451.c

+20 −68
Original line number Diff line number Diff line
@@ -1914,22 +1914,14 @@ static SIMPLE_DEV_PM_OPS(ali_pm, ali_suspend, ali_resume); 
#define ALI_PM_OPS	NULL

#endif /* CONFIG_PM_SLEEP */



static int snd_ali_free(struct snd_ali * codec)

static void snd_ali_free(struct snd_card *card)

{

	struct snd_ali *codec = card->private_data;



	if (codec->hw_initialized)

		snd_ali_disable_address_interrupt(codec);

	if (codec->irq >= 0)

		free_irq(codec->irq, codec);

	if (codec->port)

		pci_release_regions(codec->pci);

	pci_disable_device(codec->pci);

#ifdef CONFIG_PM_SLEEP

	kfree(codec->image);

#endif

	pci_dev_put(codec->pci_m1533);

	pci_dev_put(codec->pci_m7101);

	kfree(codec);

	return 0;

}



static int snd_ali_chip_init(struct snd_ali *codec)
@@ -2017,7 +2009,8 @@ static int snd_ali_resources(struct snd_ali *codec) 
		return err;

	codec->port = pci_resource_start(codec->pci, 0);



	if (request_irq(codec->pci->irq, snd_ali_card_interrupt,

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

			     snd_ali_card_interrupt,

			     IRQF_SHARED, KBUILD_MODNAME, codec)) {

		dev_err(codec->card->dev, "Unable to request irq.\n");

		return -EBUSY;
@@ -2027,48 +2020,29 @@ static int snd_ali_resources(struct snd_ali *codec) 
	dev_dbg(codec->card->dev, "resources allocated.\n");

	return 0;

}

static int snd_ali_dev_free(struct snd_device *device)

{

	struct snd_ali *codec = device->device_data;

	snd_ali_free(codec);

	return 0;

}



static int snd_ali_create(struct snd_card *card,

			  struct pci_dev *pci,

			  int pcm_streams,

			  int spdif_support,

			  struct snd_ali **r_ali)

			  int spdif_support)

{

	struct snd_ali *codec;

	int i, err;

	unsigned short cmdw;

	static const struct snd_device_ops ops = {

		.dev_free = snd_ali_dev_free,

        };



	*r_ali = NULL;



	dev_dbg(card->dev, "creating ...\n");



	/* enable PCI device */

	err = pci_enable_device(pci);

	err = pcim_enable_device(pci);

	if (err < 0)

		return err;

	/* check, if we can restrict PCI DMA transfers to 31 bits */

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

		dev_err(card->dev,

			"architecture does not support 31bit PCI busmaster DMA\n");

		pci_disable_device(pci);

		return -ENXIO;

	}



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

	if (!codec) {

		pci_disable_device(pci);

		return -ENOMEM;

	}



	spin_lock_init(&codec->reg_lock);

	spin_lock_init(&codec->voice_alloc);
@@ -2089,12 +2063,10 @@ static int snd_ali_create(struct snd_card *card, 
		cmdw |= PCI_COMMAND_IO;

		pci_write_config_word(pci, PCI_COMMAND, cmdw);

	}

	pci_set_master(pci);

	

	if (snd_ali_resources(codec)) {

		snd_ali_free(codec);

	if (snd_ali_resources(codec))

		return -EBUSY;

	}

	card->private_free = snd_ali_free;



	codec->synth.chmap = 0;

	codec->synth.chcnt = 0;
@@ -2121,24 +2093,15 @@ static int snd_ali_create(struct snd_card *card, 
	codec->pci_m1533 = pci_get_device(0x10b9, 0x1533, NULL);

	if (!codec->pci_m1533) {

		dev_err(card->dev, "cannot find ALi 1533 chip.\n");

		snd_ali_free(codec);

		return -ENODEV;

	}

	/* M7101: power management */

	codec->pci_m7101 = pci_get_device(0x10b9, 0x7101, NULL);

	if (!codec->pci_m7101 && codec->revision == ALI_5451_V02) {

		dev_err(card->dev, "cannot find ALi 7101 chip.\n");

		snd_ali_free(codec);

		return -ENODEV;

	}



	dev_dbg(card->dev, "snd_device_new is called.\n");

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

	if (err < 0) {

		snd_ali_free(codec);

		return err;

	}



	/* initialise synth voices*/

	for (i = 0; i < ALI_CHANNELS; i++)

		codec->synth.voices[i].number = i;
@@ -2150,16 +2113,14 @@ static int snd_ali_create(struct snd_card *card, 
	}



#ifdef CONFIG_PM_SLEEP

	codec->image = kmalloc(sizeof(*codec->image), GFP_KERNEL);

	codec->image = devm_kmalloc(&pci->dev, sizeof(*codec->image),

				    GFP_KERNEL);

	if (!codec->image)

		dev_warn(card->dev, "can't allocate apm buffer\n");

#endif



	snd_ali_enable_address_interrupt(codec);

	codec->hw_initialized = 1;



	*r_ali = codec;

	dev_dbg(card->dev, "created.\n");

	return 0;

}
@@ -2172,24 +2133,25 @@ static int snd_ali_probe(struct pci_dev *pci, 


	dev_dbg(&pci->dev, "probe ...\n");



	err = snd_card_new(&pci->dev, index, id, THIS_MODULE, 0, &card);

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

				sizeof(*codec), &card);

	if (err < 0)

		return err;

	codec = card->private_data;



	err = snd_ali_create(card, pci, pcm_channels, spdif, &codec);

	err = snd_ali_create(card, pci, pcm_channels, spdif);

	if (err < 0)

		goto error;

	card->private_data = codec;

		return err;



	dev_dbg(&pci->dev, "mixer building ...\n");

	err = snd_ali_mixer(codec);

	if (err < 0)

		goto error;

		return err;

	

	dev_dbg(&pci->dev, "pcm building ...\n");

	err = snd_ali_build_pcms(codec);

	if (err < 0)

		goto error;

		return err;



	snd_ali_proc_init(codec);
@@ -2202,26 +2164,16 @@ static int snd_ali_probe(struct pci_dev *pci, 
	dev_dbg(&pci->dev, "register card.\n");

	err = snd_card_register(card);

	if (err < 0)

		goto error;

		return err;



	pci_set_drvdata(pci, card);

	return 0;



 error:

	snd_card_free(card);

	return err;

}



static void snd_ali_remove(struct pci_dev *pci)

{

	snd_card_free(pci_get_drvdata(pci));

}



static struct pci_driver ali5451_driver = {

	.name = KBUILD_MODNAME,

	.id_table = snd_ali_ids,

	.probe = snd_ali_probe,

	.remove = snd_ali_remove,

	.driver = {

		.pm = ALI_PM_OPS,

	},