iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: rme32: Allocate resources with device-managed APIs

Browse Source 
This patch converts the resource management in PCI rme32 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-22-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2021-07-15 09:58:43 +02:00
parent 5c0939253c
commit 102e6156de
1 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sound/pci/rme32.c
View File

@ -1278,27 +1278,10 @@ static const struct snd_pcm_ops snd_rme32_capture_adat_fd_ops = {
.ack = snd_rme32_capture_fd_ack, .ack = snd_rme32_capture_fd_ack,
}; };
static void snd_rme32_free(void *private_data) static void snd_rme32_free(struct rme32 *rme32)
{ {
struct rme32 *rme32 = (struct rme32 *) private_data; if (rme32->irq >= 0)
if (rme32 == NULL) {
return;
}
if (rme32->irq >= 0) {
snd_rme32_pcm_stop(rme32, 0); snd_rme32_pcm_stop(rme32, 0);
free_irq(rme32->irq, (void *) rme32);
rme32->irq = -1;
}
if (rme32->iobase) {
iounmap(rme32->iobase);
rme32->iobase = NULL;
}
if (rme32->port) {
pci_release_regions(rme32->pci);
rme32->port = 0;
}
pci_disable_device(rme32->pci);
} }
static void snd_rme32_free_spdif_pcm(struct snd_pcm *pcm) static void snd_rme32_free_spdif_pcm(struct snd_pcm *pcm)
@ -1322,7 +1305,7 @@ static int snd_rme32_create(struct rme32 *rme32)
rme32->irq = -1; rme32->irq = -1;
spin_lock_init(&rme32->lock); spin_lock_init(&rme32->lock);
err = pci_enable_device(pci); err = pcim_enable_device(pci);
if (err < 0) if (err < 0)
return err; return err;
@ -1331,16 +1314,16 @@ static int snd_rme32_create(struct rme32 *rme32)
return err; return err;
rme32->port = pci_resource_start(rme32->pci, 0); rme32->port = pci_resource_start(rme32->pci, 0);
rme32->iobase = ioremap(rme32->port, RME32_IO_SIZE); rme32->iobase = devm_ioremap(&pci->dev, rme32->port, RME32_IO_SIZE);
if (!rme32->iobase) { if (!rme32->iobase) {
dev_err(rme32->card->dev, dev_err(rme32->card->dev,
"unable to remap memory region 0x%lx-0x%lx\n", "unable to remap memory region 0x%lx-0x%lx\n",
rme32->port, rme32->port + RME32_IO_SIZE - 1); rme32->port, rme32->port + RME32_IO_SIZE - 1);
return -ENOMEM; return -ENOMEM;
} }
if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_SHARED, if (devm_request_irq(&pci->dev, pci->irq, snd_rme32_interrupt,
KBUILD_MODNAME, rme32)) { IRQF_SHARED, KBUILD_MODNAME, rme32)) {
dev_err(rme32->card->dev, "unable to grab IRQ %d\n", pci->irq); dev_err(rme32->card->dev, "unable to grab IRQ %d\n", pci->irq);
return -EBUSY; return -EBUSY;
} }
@ -1907,8 +1890,8 @@ snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
return -ENOENT; return -ENOENT;
} }
err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
sizeof(struct rme32), &card); sizeof(*rme32), &card);
if (err < 0) if (err < 0)
return err; return err;
card->private_free = snd_rme32_card_free; card->private_free = snd_rme32_card_free;
@ -1918,10 +1901,8 @@ snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
if (fullduplex[dev]) if (fullduplex[dev])
rme32->fullduplex_mode = 1; rme32->fullduplex_mode = 1;
err = snd_rme32_create(rme32); err = snd_rme32_create(rme32);
if (err < 0) { if (err < 0)
snd_card_free(card);
return err; return err;
}
strcpy(card->driver, "Digi32"); strcpy(card->driver, "Digi32");
switch (rme32->pci->device) { switch (rme32->pci->device) {
@ -1939,25 +1920,17 @@ snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
card->shortname, rme32->rev, rme32->port, rme32->irq); card->shortname, rme32->rev, rme32->port, rme32->irq);
err = snd_card_register(card); err = snd_card_register(card);
if (err < 0) { if (err < 0)
snd_card_free(card);
return err; return err;
}
pci_set_drvdata(pci, card); pci_set_drvdata(pci, card);
dev++; dev++;
return 0; return 0;
} }
static void snd_rme32_remove(struct pci_dev *pci)
{
snd_card_free(pci_get_drvdata(pci));
}
static struct pci_driver rme32_driver = { static struct pci_driver rme32_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = snd_rme32_ids, .id_table = snd_rme32_ids,
.probe = snd_rme32_probe, .probe = snd_rme32_probe,
.remove = snd_rme32_remove,
}; };
module_pci_driver(rme32_driver); module_pci_driver(rme32_driver);