Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: mips: Convert to snd_card_new() with a device pointer

Browse Source 
Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-01-29 14:34:47 +01:00
parent 7d13211cf9
commit bee1bb19cf
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/mips/au1x00.c
View File

@ -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;

3
sound/mips/hal2.c
View File

@ -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) {

3
sound/mips/sgio2audio.c
View File

@ -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) {