ALSA: ad1816a: Allocate resources with device-managed APIs

This patch converts the resource management in ISA ad1816a 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-53-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index fa5bed0..9ac8737 100644 (file)
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -124,28 +124,24 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
        struct snd_ad1816a *chip;
        struct snd_opl3 *opl3;
 
-       error = snd_card_new(&pcard->card->dev,
-                            index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_ad1816a), &card);
+       error = snd_devm_card_new(&pcard->card->dev,
+                                 index[dev], id[dev], THIS_MODULE,
+                                 sizeof(struct snd_ad1816a), &card);
        if (error < 0)
                return error;
        chip = card->private_data;
 
        error = snd_card_ad1816a_pnp(dev, pcard, pid);
-       if (error) {
-               snd_card_free(card);
+       if (error)
                return error;
-       }
 
        error = snd_ad1816a_create(card, port[dev],
                                   irq[dev],
                                   dma1[dev],
                                   dma2[dev],
                                   chip);
-       if (error) {
-               snd_card_free(card);
+       if (error)
                return error;
-       }
        if (clockfreq[dev] >= 5000 && clockfreq[dev] <= 100000)
                chip->clock_freq = clockfreq[dev];
 
@@ -155,22 +151,16 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
                card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
 
        error = snd_ad1816a_pcm(chip, 0);
-       if (error < 0) {
-               snd_card_free(card);
+       if (error < 0)
                return error;
-       }
 
        error = snd_ad1816a_mixer(chip);
-       if (error < 0) {
-               snd_card_free(card);
+       if (error < 0)
                return error;
-       }
 
        error = snd_ad1816a_timer(chip, 0);
-       if (error < 0) {
-               snd_card_free(card);
+       if (error < 0)
                return error;
-       }
 
        if (mpu_port[dev] > 0) {
                if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
@@ -186,18 +176,14 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
                        printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx.\n", fm_port[dev], fm_port[dev] + 2);
                } else {
                        error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
-                       if (error < 0) {
-                               snd_card_free(card);
+                       if (error < 0)
                                return error;
-                       }
                }
        }
 
        error = snd_card_register(card);
-       if (error < 0) {
-               snd_card_free(card);
+       if (error < 0)
                return error;
-       }
        pnp_set_card_drvdata(pcard, card);
        return 0;
 }
@@ -223,12 +209,6 @@ static int snd_ad1816a_pnp_detect(struct pnp_card_link *card,
         return -ENODEV;
 }
 
-static void snd_ad1816a_pnp_remove(struct pnp_card_link *pcard)
-{
-       snd_card_free(pnp_get_card_drvdata(pcard));
-       pnp_set_card_drvdata(pcard, NULL);
-}
-
 #ifdef CONFIG_PM
 static int snd_ad1816a_pnp_suspend(struct pnp_card_link *pcard,
                                   pm_message_t state)
@@ -255,7 +235,6 @@ static struct pnp_card_driver ad1816a_pnpc_driver = {
        .name           = "ad1816a",
        .id_table       = snd_ad1816a_pnpids,
        .probe          = snd_ad1816a_pnp_detect,
-       .remove         = snd_ad1816a_pnp_remove,
 #ifdef CONFIG_PM
        .suspend        = snd_ad1816a_pnp_suspend,
        .resume         = snd_ad1816a_pnp_resume,

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index 6d4999b..132a095 100644 (file)
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -541,28 +541,6 @@ static int snd_ad1816a_probe(struct snd_ad1816a *chip)
        return 0;
 }
 
-static int snd_ad1816a_free(struct snd_ad1816a *chip)
-{
-       release_and_free_resource(chip->res_port);
-       if (chip->irq >= 0)
-               free_irq(chip->irq, (void *) chip);
-       if (chip->dma1 >= 0) {
-               snd_dma_disable(chip->dma1);
-               free_dma(chip->dma1);
-       }
-       if (chip->dma2 >= 0) {
-               snd_dma_disable(chip->dma2);
-               free_dma(chip->dma2);
-       }
-       return 0;
-}
-
-static int snd_ad1816a_dev_free(struct snd_device *device)
-{
-       struct snd_ad1816a *chip = device->device_data;
-       return snd_ad1816a_free(chip);
-}
-
 static const char *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
 {
        switch (chip->hardware) {
@@ -580,37 +558,31 @@ int snd_ad1816a_create(struct snd_card *card,
                       unsigned long port, int irq, int dma1, int dma2,
                       struct snd_ad1816a *chip)
 {
-       static const struct snd_device_ops ops = {
-               .dev_free =     snd_ad1816a_dev_free,
-       };
        int error;
 
        chip->irq = -1;
        chip->dma1 = -1;
        chip->dma2 = -1;
 
-       chip->res_port = request_region(port, 16, "AD1816A");
+       chip->res_port = devm_request_region(card->dev, port, 16, "AD1816A");
        if (!chip->res_port) {
                snd_printk(KERN_ERR "ad1816a: can't grab port 0x%lx\n", port);
-               snd_ad1816a_free(chip);
                return -EBUSY;
        }
-       if (request_irq(irq, snd_ad1816a_interrupt, 0, "AD1816A", (void *) chip)) {
+       if (devm_request_irq(card->dev, irq, snd_ad1816a_interrupt, 0,
+                            "AD1816A", (void *) chip)) {
                snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);
-               snd_ad1816a_free(chip);
                return -EBUSY;
        }
        chip->irq = irq;
        card->sync_irq = chip->irq;
-       if (request_dma(dma1, "AD1816A - 1")) {
+       if (snd_devm_request_dma(card->dev, dma1, "AD1816A - 1")) {
                snd_printk(KERN_ERR "ad1816a: can't grab DMA1 %d\n", dma1);
-               snd_ad1816a_free(chip);
                return -EBUSY;
        }
        chip->dma1 = dma1;
-       if (request_dma(dma2, "AD1816A - 2")) {
+       if (snd_devm_request_dma(card->dev, dma2, "AD1816A - 2")) {
                snd_printk(KERN_ERR "ad1816a: can't grab DMA2 %d\n", dma2);
-               snd_ad1816a_free(chip);
                return -EBUSY;
        }
        chip->dma2 = dma2;
@@ -620,20 +592,11 @@ int snd_ad1816a_create(struct snd_card *card,
        spin_lock_init(&chip->lock);
 
        error = snd_ad1816a_probe(chip);
-       if (error) {
-               snd_ad1816a_free(chip);
+       if (error)
                return error;
-       }
 
        snd_ad1816a_init(chip);
 
-       /* Register device */
-       error = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-       if (error < 0) {
-               snd_ad1816a_free(chip);
-               return error;
-       }
-
        return 0;
 }