summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 17:34:47 +0400
committerTakashi Iwai <tiwai@suse.de>2014-02-14 11:14:05 +0400
commitbee1bb19cf97413494a5254de63d43d52d93d4f8 (patch)
tree43d8c7fed12b3dbcd2c247b0730fed8f366a2ee2
parent7d13211cf95586c35f8e7b7f77e3d8104d48f516 (diff)
downloadlinux-bee1bb19cf97413494a5254de63d43d52d93d4f8.tar.xz
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>
-rw-r--r--sound/mips/au1x00.c4
-rw-r--r--sound/mips/hal2.c3
-rw-r--r--sound/mips/sgio2audio.c3
3 files changed, 4 insertions, 6 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index 526e59f43832..a7cc49e96068 100644
--- 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 2b7f6e8bdd24..23441b9e6148 100644
--- 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 cfe99ae149fe..04bb06c03ec8 100644
--- 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) {