ALSA: sparc: 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>

1 files changed, 6 insertions, 5 deletions

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index dbb1b625eb2f..4e91bcaa3664 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1565,7 +1565,8 @@ static int snd_cs4231_mixer(struct snd_card *card)
 
 static int dev;
 
-static int cs4231_attach_begin(struct snd_card **rcard)
+static int cs4231_attach_begin(struct platform_device *op,
+                               struct snd_card **rcard)
 {
         struct snd_card *card;
         struct snd_cs4231 *chip;
@@ -1581,8 +1582,8 @@ static int cs4231_attach_begin(struct snd_card **rcard)
                 return -ENOENT;
         }
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_cs4231), &card);
+        err = snd_card_new(&op->dev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_cs4231), &card);
         if (err < 0)
                 return err;
 
@@ -1869,7 +1870,7 @@ static int cs4231_sbus_probe(struct platform_device *op)
         struct snd_card *card;
         int err;
 
-        err = cs4231_attach_begin(&card);
+        err = cs4231_attach_begin(op, &card);
         if (err)
                 return err;
 
@@ -2060,7 +2061,7 @@ static int cs4231_ebus_probe(struct platform_device *op)
         struct snd_card *card;
         int err;
 
-        err = cs4231_attach_begin(&card);
+        err = cs4231_attach_begin(op, &card);
         if (err)
                 return err;