tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Takashi Iwai bee1bb19 7d13211c

+4 -6
+2 -2
sound/mips/au1x00.c
··· 601 601 struct snd_ac97_bus *pbus; 602 602 struct snd_ac97_template ac97; 603 603 604 - err = snd_card_create(-1, "AC97", THIS_MODULE, 605 - sizeof(struct snd_au1000), &card); 604 + err = snd_card_new(&pdev->dev, -1, "AC97", THIS_MODULE, 605 + sizeof(struct snd_au1000), &card); 606 606 if (err < 0) 607 607 return err; 608 608
+1 -2
sound/mips/hal2.c
··· 880 880 struct snd_hal2 *chip; 881 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 884 if (err < 0) 885 885 return err; 886 886 ··· 889 889 snd_card_free(card); 890 890 return err; 891 891 } 892 - snd_card_set_dev(card, &pdev->dev); 893 892 894 893 err = hal2_pcm_create(chip); 895 894 if (err < 0) {
+1 -2
sound/mips/sgio2audio.c
··· 920 920 struct snd_sgio2audio *chip; 921 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 924 if (err < 0) 925 925 return err; 926 926 ··· 929 929 snd_card_free(card); 930 930 return err; 931 931 } 932 - snd_card_set_dev(card, &pdev->dev); 933 932 934 933 err = snd_sgio2audio_new_pcm(chip); 935 934 if (err < 0) {