Skip to content

L
linux
Commit 86bde74d authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: atiixp: Allocate resources with device-managed APIs 

Like the previous patch, this patch converts the resource allocations
with device-managed API calls, so that we can reduce resource-free
calls.

The atiixp drivers are simpler than intel8x0, and even the irq can be
allocated with devres.

The end result is a good amount of code reduction.

Link: https://lore.kernel.org/r/20210715075941.23332-7-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7835e090
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 144 deletions
sound/pci/atiixp.c
View file @ 86bde74d
...@@ -1530,87 +1530,44 @@ static void snd_atiixp_proc_init(struct atiixp *chip) ...@@ -1530,87 +1530,44 @@ static void snd_atiixp_proc_init(struct atiixp *chip)
* destructor * destructor
*/ */
static int snd_atiixp_free(struct atiixp *chip) static void snd_atiixp_free(struct snd_card *card)
{ {
if (chip->irq < 0) snd_atiixp_chip_stop(card->private_data);
goto __hw_end;
snd_atiixp_chip_stop(chip);
__hw_end:
if (chip->irq >= 0)
free_irq(chip->irq, chip);
iounmap(chip->remap_addr);
pci_release_regions(chip->pci);
pci_disable_device(chip->pci);
kfree(chip);
return 0;
}
static int snd_atiixp_dev_free(struct snd_device *device)
{
struct atiixp *chip = device->device_data;
return snd_atiixp_free(chip);
} }
/* /*
* constructor for chip instance * constructor for chip instance
*/ */
static int snd_atiixp_create(struct snd_card *card, static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci)
struct pci_dev *pci,
struct atiixp **r_chip)
{ {
static const struct snd_device_ops ops = { struct atiixp *chip = card->private_data;
.dev_free = snd_atiixp_dev_free,
};
struct atiixp *chip;
int err; int err;
err = pci_enable_device(pci); err = pcim_enable_device(pci);
if (err < 0) if (err < 0)
return err; return err;
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) {
pci_disable_device(pci);
return -ENOMEM;
}
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);
mutex_init(&chip->open_mutex); mutex_init(&chip->open_mutex);
chip->card = card; chip->card = card;
chip->pci = pci; chip->pci = pci;
chip->irq = -1; chip->irq = -1;
err = pci_request_regions(pci, "ATI IXP AC97"); err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP AC97");
if (err < 0) { if (err < 0)
pci_disable_device(pci);
kfree(chip);
return err; return err;
}
chip->addr = pci_resource_start(pci, 0); chip->addr = pci_resource_start(pci, 0);
chip->remap_addr = pci_ioremap_bar(pci, 0); chip->remap_addr = pcim_iomap_table(pci)[0];
if (chip->remap_addr == NULL) {
dev_err(card->dev, "AC'97 space ioremap problem\n");
snd_atiixp_free(chip);
return -EIO;
}
if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt,
KBUILD_MODNAME, chip)) { IRQF_SHARED, KBUILD_MODNAME, chip)) {
dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
snd_atiixp_free(chip);
return -EBUSY; return -EBUSY;
} }
chip->irq = pci->irq; chip->irq = pci->irq;
card->sync_irq = chip->irq; card->sync_irq = chip->irq;
card->private_free = snd_atiixp_free;
pci_set_master(pci); pci_set_master(pci);
err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
if (err < 0) {
snd_atiixp_free(chip);
return err;
}
*r_chip = chip;
return 0; return 0;
} }
...@@ -1622,30 +1579,31 @@ static int snd_atiixp_probe(struct pci_dev *pci, ...@@ -1622,30 +1579,31 @@ static int snd_atiixp_probe(struct pci_dev *pci,
struct atiixp *chip; struct atiixp *chip;
int err; int err;
err = snd_card_new(&pci->dev, index, id, THIS_MODULE, 0, &card); err = snd_devm_card_new(&pci->dev, index, id, THIS_MODULE,
sizeof(*chip), &card);
if (err < 0) if (err < 0)
return err; return err;
chip = card->private_data;
strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA"); strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");
strcpy(card->shortname, "ATI IXP"); strcpy(card->shortname, "ATI IXP");
err = snd_atiixp_create(card, pci, &chip); err = snd_atiixp_init(card, pci);
if (err < 0) if (err < 0)
goto __error; return err;
card->private_data = chip;
err = snd_atiixp_aclink_reset(chip); err = snd_atiixp_aclink_reset(chip);
if (err < 0) if (err < 0)
goto __error; return err;
chip->spdif_over_aclink = spdif_aclink; chip->spdif_over_aclink = spdif_aclink;
err = snd_atiixp_mixer_new(chip, ac97_clock, ac97_quirk); err = snd_atiixp_mixer_new(chip, ac97_clock, ac97_quirk);
if (err < 0) if (err < 0)
goto __error; return err;
err = snd_atiixp_pcm_new(chip); err = snd_atiixp_pcm_new(chip);
if (err < 0) if (err < 0)
goto __error; return err;
snd_atiixp_proc_init(chip); snd_atiixp_proc_init(chip);
...@@ -1659,26 +1617,16 @@ static int snd_atiixp_probe(struct pci_dev *pci, ...@@ -1659,26 +1617,16 @@ static int snd_atiixp_probe(struct pci_dev *pci,
err = snd_card_register(card); err = snd_card_register(card);
if (err < 0) if (err < 0)
goto __error; return err;
pci_set_drvdata(pci, card); pci_set_drvdata(pci, card);
return 0; return 0;
__error:
snd_card_free(card);
return err;
}
static void snd_atiixp_remove(struct pci_dev *pci)
{
snd_card_free(pci_get_drvdata(pci));
} }
static struct pci_driver atiixp_driver = { static struct pci_driver atiixp_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = snd_atiixp_ids, .id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe, .probe = snd_atiixp_probe,
.remove = snd_atiixp_remove,
.driver = { .driver = {
.pm = SND_ATIIXP_PM_OPS, .pm = SND_ATIIXP_PM_OPS,
}, },
......
sound/pci/atiixp_modem.c
View file @ 86bde74d
...@@ -1159,87 +1159,44 @@ static void snd_atiixp_proc_init(struct atiixp_modem *chip) ...@@ -1159,87 +1159,44 @@ static void snd_atiixp_proc_init(struct atiixp_modem *chip)
* destructor * destructor
*/ */
static int snd_atiixp_free(struct atiixp_modem *chip) static void snd_atiixp_free(struct snd_card *card)
{ {
if (chip->irq < 0) snd_atiixp_chip_stop(card->private_data);
goto __hw_end;
snd_atiixp_chip_stop(chip);
__hw_end:
if (chip->irq >= 0)
free_irq(chip->irq, chip);
iounmap(chip->remap_addr);
pci_release_regions(chip->pci);
pci_disable_device(chip->pci);
kfree(chip);
return 0;
}
static int snd_atiixp_dev_free(struct snd_device *device)
{
struct atiixp_modem *chip = device->device_data;
return snd_atiixp_free(chip);
} }
/* /*
* constructor for chip instance * constructor for chip instance
*/ */
static int snd_atiixp_create(struct snd_card *card, static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci)
struct pci_dev *pci,
struct atiixp_modem **r_chip)
{ {
static const struct snd_device_ops ops = { struct atiixp_modem *chip = card->private_data;
.dev_free = snd_atiixp_dev_free,
};
struct atiixp_modem *chip;
int err; int err;
err = pci_enable_device(pci); err = pcim_enable_device(pci);
if (err < 0) if (err < 0)
return err; return err;
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) {
pci_disable_device(pci);
return -ENOMEM;
}
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);
mutex_init(&chip->open_mutex); mutex_init(&chip->open_mutex);
chip->card = card; chip->card = card;
chip->pci = pci; chip->pci = pci;
chip->irq = -1; chip->irq = -1;
err = pci_request_regions(pci, "ATI IXP MC97"); err = pcim_iomap_regions(pci, 1 << 0, "ATI IXP MC97");
if (err < 0) { if (err < 0)
kfree(chip);
pci_disable_device(pci);
return err; return err;
}
chip->addr = pci_resource_start(pci, 0); chip->addr = pci_resource_start(pci, 0);
chip->remap_addr = pci_ioremap_bar(pci, 0); chip->remap_addr = pcim_iomap_table(pci)[0];
if (chip->remap_addr == NULL) {
dev_err(card->dev, "AC'97 space ioremap problem\n");
snd_atiixp_free(chip);
return -EIO;
}
if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt,
KBUILD_MODNAME, chip)) { IRQF_SHARED, KBUILD_MODNAME, chip)) {
dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
snd_atiixp_free(chip);
return -EBUSY; return -EBUSY;
} }
chip->irq = pci->irq; chip->irq = pci->irq;
card->sync_irq = chip->irq; card->sync_irq = chip->irq;
card->private_free = snd_atiixp_free;
pci_set_master(pci); pci_set_master(pci);
err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
if (err < 0) {
snd_atiixp_free(chip);
return err;
}
*r_chip = chip;
return 0; return 0;
} }
...@@ -1251,28 +1208,29 @@ static int snd_atiixp_probe(struct pci_dev *pci, ...@@ -1251,28 +1208,29 @@ static int snd_atiixp_probe(struct pci_dev *pci,
struct atiixp_modem *chip; struct atiixp_modem *chip;
int err; int err;
err = snd_card_new(&pci->dev, index, id, THIS_MODULE, 0, &card); err = snd_devm_card_new(&pci->dev, index, id, THIS_MODULE,
sizeof(*chip), &card);
if (err < 0) if (err < 0)
return err; return err;
chip = card->private_data;
strcpy(card->driver, "ATIIXP-MODEM"); strcpy(card->driver, "ATIIXP-MODEM");
strcpy(card->shortname, "ATI IXP Modem"); strcpy(card->shortname, "ATI IXP Modem");
err = snd_atiixp_create(card, pci, &chip); err = snd_atiixp_init(card, pci);
if (err < 0) if (err < 0)
goto __error; return err;
card->private_data = chip;
err = snd_atiixp_aclink_reset(chip); err = snd_atiixp_aclink_reset(chip);
if (err < 0) if (err < 0)
goto __error; return err;
err = snd_atiixp_mixer_new(chip, ac97_clock); err = snd_atiixp_mixer_new(chip, ac97_clock);
if (err < 0) if (err < 0)
goto __error; return err;
err = snd_atiixp_pcm_new(chip); err = snd_atiixp_pcm_new(chip);
if (err < 0) if (err < 0)
goto __error; return err;
snd_atiixp_proc_init(chip); snd_atiixp_proc_init(chip);
...@@ -1283,26 +1241,16 @@ static int snd_atiixp_probe(struct pci_dev *pci, ...@@ -1283,26 +1241,16 @@ static int snd_atiixp_probe(struct pci_dev *pci,
err = snd_card_register(card); err = snd_card_register(card);
if (err < 0) if (err < 0)
goto __error; return err;
pci_set_drvdata(pci, card); pci_set_drvdata(pci, card);
return 0; return 0;
__error:
snd_card_free(card);
return err;
}
static void snd_atiixp_remove(struct pci_dev *pci)
{
snd_card_free(pci_get_drvdata(pci));
} }
static struct pci_driver atiixp_modem_driver = { static struct pci_driver atiixp_modem_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = snd_atiixp_ids, .id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe, .probe = snd_atiixp_probe,
.remove = snd_atiixp_remove,
.driver = { .driver = {
.pm = SND_ATIIXP_PM_OPS, .pm = SND_ATIIXP_PM_OPS,
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7