ALSA: als100: Allocate resources with device-managed APIs

This patch converts the resource management in ISA als100 driver with
devres as a clean up.  Each manual resource management is converted
with the corresponding devres helper.  The remove callback became
superfluous and dropped.

This should give no user-visible functional changes.

Link: https://lore.kernel.org/r/20210715075941.23332-58-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index d4597fd..d582eff 100644 (file)
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -170,18 +170,16 @@ static int snd_card_als100_probe(int dev,
        struct snd_card_als100 *acard;
        struct snd_opl3 *opl3;
 
-       error = snd_card_new(&pcard->card->dev,
-                            index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_card_als100), &card);
+       error = snd_devm_card_new(&pcard->card->dev,
+                                 index[dev], id[dev], THIS_MODULE,
+                                 sizeof(struct snd_card_als100), &card);
        if (error < 0)
                return error;
        acard = card->private_data;
 
        error = snd_card_als100_pnp(dev, acard, pcard, pid);
-       if (error) {
-               snd_card_free(card);
+       if (error)
                return error;
-       }
 
        if (pid->driver_data == SB_HW_DT019X)
                dma16[dev] = -1;
@@ -191,10 +189,8 @@ static int snd_card_als100_probe(int dev,
                                  dma8[dev], dma16[dev],
                                  pid->driver_data,
                                  &chip);
-       if (error < 0) {
-               snd_card_free(card);
+       if (error < 0)
                return error;
-       }
        acard->chip = chip;
 
        if (pid->driver_data == SB_HW_DT019X) {
@@ -213,16 +209,12 @@ static int snd_card_als100_probe(int dev,
        }
 
        error = snd_sb16dsp_pcm(chip, 0);
-       if (error < 0) {
-               snd_card_free(card);
+       if (error < 0)
                return error;
-       }
 
        error = snd_sbmixer_new(chip);
-       if (error < 0) {
-               snd_card_free(card);
+       if (error < 0)
                return error;
-       }
 
        if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
                int mpu_type = MPU401_HW_ALS100;
@@ -249,23 +241,17 @@ static int snd_card_als100_probe(int dev,
                                   fm_port[dev], fm_port[dev] + 2);
                } else {
                        error = snd_opl3_timer_new(opl3, 0, 1);
-                       if (error < 0) {
-                               snd_card_free(card);
+                       if (error < 0)
                                return error;
-                       }
                        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;
 }
@@ -291,12 +277,6 @@ static int snd_als100_pnp_detect(struct pnp_card_link *card,
        return -ENODEV;
 }
 
-static void snd_als100_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_als100_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)
 {
@@ -327,7 +307,6 @@ static struct pnp_card_driver als100_pnpc_driver = {
        .name           = "als100",
         .id_table       = snd_als100_pnpids,
         .probe          = snd_als100_pnp_detect,
-       .remove         = snd_als100_pnp_remove,
 #ifdef CONFIG_PM
        .suspend        = snd_als100_pnp_suspend,
        .resume         = snd_als100_pnp_resume,