ALSA: ad1848: Allocate resources with device-managed APIs

[linux-2.6-microblaze.git] / sound / isa / ad1848 / ad1848.c

diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index edafb49..c471ac2 100644 (file)
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -72,7 +72,7 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
        struct snd_wss *chip;
        int error;
 
-       error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
+       error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
        if (error < 0)
                return error;
 
@@ -80,17 +80,17 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
                        thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT,
                        0, &chip);
        if (error < 0)
-               goto out;
+               return error;
 
        card->private_data = chip;
 
        error = snd_wss_pcm(chip, 0);
        if (error < 0)
-               goto out;
+               return error;
 
        error = snd_wss_mixer(chip);
        if (error < 0)
-               goto out;
+               return error;
 
        strscpy(card->driver, "AD1848", sizeof(card->driver));
        strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
@@ -106,18 +106,10 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
 
        error = snd_card_register(card);
        if (error < 0)
-               goto out;
+               return error;
 
        dev_set_drvdata(dev, card);
        return 0;
-
-out:   snd_card_free(card);
-       return error;
-}
-
-static void snd_ad1848_remove(struct device *dev, unsigned int n)
-{
-       snd_card_free(dev_get_drvdata(dev));
 }
 
 #ifdef CONFIG_PM
@@ -145,7 +137,6 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n)
 static struct isa_driver snd_ad1848_driver = {
        .match          = snd_ad1848_match,
        .probe          = snd_ad1848_probe,
-       .remove         = snd_ad1848_remove,
 #ifdef CONFIG_PM
        .suspend        = snd_ad1848_suspend,
        .resume         = snd_ad1848_resume,