mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 13:44:15 +08:00
ALSA: ice1724: Allocate resources with device-managed APIs
This patch converts the resource management in PCI ice1724 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. Along with it, the chip_exit callback chain is moved into the card's private_free instead of the PCI remove callback, too. This should give no user-visible functional changes. Link: https://lore.kernel.org/r/20210715075941.23332-37-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
parent
ca642da4b3
commit
272d6efa0b
@ -2447,54 +2447,29 @@ static int snd_vt1724_build_controls(struct snd_ice1712 *ice)
|
||||
snd_ctl_new1(&snd_vt1724_mixer_pro_peak, ice));
|
||||
}
|
||||
|
||||
static int snd_vt1724_free(struct snd_ice1712 *ice)
|
||||
static void snd_vt1724_free(struct snd_card *card)
|
||||
{
|
||||
if (!ice->port)
|
||||
goto __hw_end;
|
||||
struct snd_ice1712 *ice = card->private_data;
|
||||
|
||||
/* mask all interrupts */
|
||||
outb(0xff, ICEMT1724(ice, DMA_INT_MASK));
|
||||
outb(0xff, ICEREG1724(ice, IRQMASK));
|
||||
/* --- */
|
||||
__hw_end:
|
||||
if (ice->irq >= 0)
|
||||
free_irq(ice->irq, ice);
|
||||
pci_release_regions(ice->pci);
|
||||
snd_ice1712_akm4xxx_free(ice);
|
||||
pci_disable_device(ice->pci);
|
||||
kfree(ice->spec);
|
||||
kfree(ice);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_vt1724_dev_free(struct snd_device *device)
|
||||
{
|
||||
struct snd_ice1712 *ice = device->device_data;
|
||||
return snd_vt1724_free(ice);
|
||||
snd_ice1712_akm4xxx_free(ice);
|
||||
}
|
||||
|
||||
static int snd_vt1724_create(struct snd_card *card,
|
||||
struct pci_dev *pci,
|
||||
const char *modelname,
|
||||
struct snd_ice1712 **r_ice1712)
|
||||
const char *modelname)
|
||||
{
|
||||
struct snd_ice1712 *ice;
|
||||
int err;
|
||||
static const struct snd_device_ops ops = {
|
||||
.dev_free = snd_vt1724_dev_free,
|
||||
};
|
||||
|
||||
*r_ice1712 = NULL;
|
||||
|
||||
/* enable PCI device */
|
||||
err = pci_enable_device(pci);
|
||||
err = pcim_enable_device(pci);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
ice = kzalloc(sizeof(*ice), GFP_KERNEL);
|
||||
if (ice == NULL) {
|
||||
pci_disable_device(pci);
|
||||
return -ENOMEM;
|
||||
}
|
||||
ice->vt1724 = 1;
|
||||
spin_lock_init(&ice->reg_lock);
|
||||
mutex_init(&ice->gpio_mutex);
|
||||
@ -2512,44 +2487,28 @@ static int snd_vt1724_create(struct snd_card *card,
|
||||
pci_set_master(pci);
|
||||
snd_vt1724_proc_init(ice);
|
||||
|
||||
card->private_data = ice;
|
||||
|
||||
err = pci_request_regions(pci, "ICE1724");
|
||||
if (err < 0) {
|
||||
kfree(ice);
|
||||
pci_disable_device(pci);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
ice->port = pci_resource_start(pci, 0);
|
||||
ice->profi_port = pci_resource_start(pci, 1);
|
||||
|
||||
if (request_irq(pci->irq, snd_vt1724_interrupt,
|
||||
IRQF_SHARED, KBUILD_MODNAME, ice)) {
|
||||
if (devm_request_irq(&pci->dev, pci->irq, snd_vt1724_interrupt,
|
||||
IRQF_SHARED, KBUILD_MODNAME, ice)) {
|
||||
dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_vt1724_free(ice);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
ice->irq = pci->irq;
|
||||
card->sync_irq = ice->irq;
|
||||
card->private_free = snd_vt1724_free;
|
||||
|
||||
snd_vt1724_chip_reset(ice);
|
||||
if (snd_vt1724_read_eeprom(ice, modelname) < 0) {
|
||||
snd_vt1724_free(ice);
|
||||
if (snd_vt1724_read_eeprom(ice, modelname) < 0)
|
||||
return -EIO;
|
||||
}
|
||||
if (snd_vt1724_chip_init(ice) < 0) {
|
||||
snd_vt1724_free(ice);
|
||||
if (snd_vt1724_chip_init(ice) < 0)
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ice, &ops);
|
||||
if (err < 0) {
|
||||
snd_vt1724_free(ice);
|
||||
return err;
|
||||
}
|
||||
|
||||
*r_ice1712 = ice;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2576,19 +2535,18 @@ static int snd_vt1724_probe(struct pci_dev *pci,
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
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(*ice), &card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
ice = card->private_data;
|
||||
|
||||
strcpy(card->driver, "ICE1724");
|
||||
strcpy(card->shortname, "ICEnsemble ICE1724");
|
||||
|
||||
err = snd_vt1724_create(card, pci, model[dev], &ice);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
err = snd_vt1724_create(card, pci, model[dev]);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
/* field init before calling chip_init */
|
||||
ice->ext_clock_count = 0;
|
||||
@ -2600,10 +2558,8 @@ static int snd_vt1724_probe(struct pci_dev *pci,
|
||||
strcpy(card->driver, c->driver);
|
||||
if (c->chip_init) {
|
||||
err = c->chip_init(ice);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2637,49 +2593,35 @@ static int snd_vt1724_probe(struct pci_dev *pci,
|
||||
set_std_hw_rates(ice);
|
||||
|
||||
err = snd_vt1724_pcm_profi(ice, pcm_dev++);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
err = snd_vt1724_pcm_spdif(ice, pcm_dev++);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
err = snd_vt1724_pcm_indep(ice, pcm_dev++);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
err = snd_vt1724_ac97_mixer(ice);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
err = snd_vt1724_build_controls(ice);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
if (ice->pcm && ice->has_spdif) { /* has SPDIF I/O */
|
||||
err = snd_vt1724_spdif_build_controls(ice);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
if (c && c->build_controls) {
|
||||
err = c->build_controls(ice);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
if (!c || !c->no_mpu401) {
|
||||
@ -2687,10 +2629,8 @@ static int snd_vt1724_probe(struct pci_dev *pci,
|
||||
struct snd_rawmidi *rmidi;
|
||||
|
||||
err = snd_rawmidi_new(card, "MIDI", 0, 1, 1, &rmidi);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
ice->rmidi[0] = rmidi;
|
||||
rmidi->private_data = ice;
|
||||
strcpy(rmidi->name, "ICE1724 MIDI");
|
||||
@ -2715,25 +2655,13 @@ static int snd_vt1724_probe(struct pci_dev *pci,
|
||||
card->shortname, ice->port, ice->irq);
|
||||
|
||||
err = snd_card_register(card);
|
||||
if (err < 0) {
|
||||
snd_card_free(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
pci_set_drvdata(pci, card);
|
||||
dev++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void snd_vt1724_remove(struct pci_dev *pci)
|
||||
{
|
||||
struct snd_card *card = pci_get_drvdata(pci);
|
||||
struct snd_ice1712 *ice = card->private_data;
|
||||
|
||||
if (ice->card_info && ice->card_info->chip_exit)
|
||||
ice->card_info->chip_exit(ice);
|
||||
snd_card_free(card);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int snd_vt1724_suspend(struct device *dev)
|
||||
{
|
||||
@ -2811,7 +2739,6 @@ static struct pci_driver vt1724_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_vt1724_ids,
|
||||
.probe = snd_vt1724_probe,
|
||||
.remove = snd_vt1724_remove,
|
||||
.driver = {
|
||||
.pm = SND_VT1724_PM_OPS,
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user