ALSA: isa: 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, 7 deletions

diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 82dd76939fa0..bfbf38cf9841 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -334,14 +334,15 @@ snd_wavefront_free(struct snd_card *card)
         }
 }
 
-static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
+static int snd_wavefront_card_new(struct device *pdev, int dev,
+                                  struct snd_card **cardp)
 {
         struct snd_card *card;
         snd_wavefront_card_t *acard;
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(snd_wavefront_card_t), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(snd_wavefront_card_t), &card);
         if (err < 0)
                 return err;
 
@@ -564,10 +565,9 @@ static int snd_wavefront_isa_probe(struct device *pdev,
         struct snd_card *card;
         int err;
 
-        err = snd_wavefront_card_new(dev, &card);
+        err = snd_wavefront_card_new(pdev, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, pdev);
         if ((err = snd_wavefront_probe(card, dev)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -612,7 +612,7 @@ static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
 
-        res = snd_wavefront_card_new(dev, &card);
+        res = snd_wavefront_card_new(&pcard->card->dev, dev, &card);
         if (res < 0)
                 return res;
 
@@ -623,7 +623,6 @@ static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
                         return -ENODEV;
                 }
         }
-        snd_card_set_dev(card, &pcard->card->dev);
 
         if ((res = snd_wavefront_probe(card, dev)) < 0)
                 return res;