diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:34:47 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 02:14:05 -0500 |
commit | bee1bb19cf97413494a5254de63d43d52d93d4f8 (patch) | |
tree | 43d8c7fed12b3dbcd2c247b0730fed8f366a2ee2 | |
parent | 7d13211cf95586c35f8e7b7f77e3d8104d48f516 (diff) |
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.c | 4 | ||||
-rw-r--r-- | sound/mips/hal2.c | 3 | ||||
-rw-r--r-- | sound/mips/sgio2audio.c | 3 |
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) | |||
601 | struct snd_ac97_bus *pbus; | 601 | struct snd_ac97_bus *pbus; |
602 | struct snd_ac97_template ac97; | 602 | struct snd_ac97_template ac97; |
603 | 603 | ||
604 | err = snd_card_create(-1, "AC97", THIS_MODULE, | 604 | err = snd_card_new(&pdev->dev, -1, "AC97", THIS_MODULE, |
605 | sizeof(struct snd_au1000), &card); | 605 | sizeof(struct snd_au1000), &card); |
606 | if (err < 0) | 606 | if (err < 0) |
607 | return err; | 607 | return err; |
608 | 608 | ||
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) | |||
880 | struct snd_hal2 *chip; | 880 | struct snd_hal2 *chip; |
881 | int err; | 881 | int err; |
882 | 882 | ||
883 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); | 883 | err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card); |
884 | if (err < 0) | 884 | if (err < 0) |
885 | return err; | 885 | return err; |
886 | 886 | ||
@@ -889,7 +889,6 @@ static int hal2_probe(struct platform_device *pdev) | |||
889 | snd_card_free(card); | 889 | snd_card_free(card); |
890 | return err; | 890 | return err; |
891 | } | 891 | } |
892 | snd_card_set_dev(card, &pdev->dev); | ||
893 | 892 | ||
894 | err = hal2_pcm_create(chip); | 893 | err = hal2_pcm_create(chip); |
895 | if (err < 0) { | 894 | 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) | |||
920 | struct snd_sgio2audio *chip; | 920 | struct snd_sgio2audio *chip; |
921 | int err; | 921 | int err; |
922 | 922 | ||
923 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); | 923 | err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card); |
924 | if (err < 0) | 924 | if (err < 0) |
925 | return err; | 925 | return err; |
926 | 926 | ||
@@ -929,7 +929,6 @@ static int snd_sgio2audio_probe(struct platform_device *pdev) | |||
929 | snd_card_free(card); | 929 | snd_card_free(card); |
930 | return err; | 930 | return err; |
931 | } | 931 | } |
932 | snd_card_set_dev(card, &pdev->dev); | ||
933 | 932 | ||
934 | err = snd_sgio2audio_new_pcm(chip); | 933 | err = snd_sgio2audio_new_pcm(chip); |
935 | if (err < 0) { | 934 | if (err < 0) { |