ALSA: mips: Convert to snd_card_new() with a device pointer

Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index 526e59f43832b7056340364c0d0ab9b570f1101a..a7cc49e960685d97f223accb9916f478a1e22e43 100644 (file)
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -601,8 +601,8 @@ static int au1000_ac97_probe(struct platform_device *pdev)
        struct snd_ac97_bus *pbus;
        struct snd_ac97_template ac97;
 
-       err = snd_card_create(-1, "AC97", THIS_MODULE,
-                               sizeof(struct snd_au1000), &card);
+       err = snd_card_new(&pdev->dev, -1, "AC97", THIS_MODULE,
+                          sizeof(struct snd_au1000), &card);
        if (err < 0)
                return err;
 

diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index 2b7f6e8bdd24343bd41ce854bb93383815386d6b..23441b9e6148b6ded73a89c01eb3ac93e65a4895 100644 (file)
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -880,7 +880,7 @@ static int hal2_probe(struct platform_device *pdev)
        struct snd_hal2 *chip;
        int err;
 
-       err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+       err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card);
        if (err < 0)
                return err;
 
@@ -889,7 +889,6 @@ static int hal2_probe(struct platform_device *pdev)
                snd_card_free(card);
                return err;
        }
-       snd_card_set_dev(card, &pdev->dev);
 
        err = hal2_pcm_create(chip);
        if (err < 0) {

diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index cfe99ae149fed9f55d70dc10f23e12e59fa4ee34..04bb06c03ec80bf2673644f616cbfb39579f6ba3 100644 (file)
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -920,7 +920,7 @@ static int snd_sgio2audio_probe(struct platform_device *pdev)
        struct snd_sgio2audio *chip;
        int err;
 
-       err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+       err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card);
        if (err < 0)
                return err;
 
@@ -929,7 +929,6 @@ static int snd_sgio2audio_probe(struct platform_device *pdev)
                snd_card_free(card);
                return err;
        }
-       snd_card_set_dev(card, &pdev->dev);
 
        err = snd_sgio2audio_new_pcm(chip);
        if (err < 0) {