summaryrefslogtreecommitdiffstats
path: root/sound/ppc/powermac.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 14:38:59 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-14 08:14:06 +0100
commit1076879744d1b7709d5b7556cfe038039fbc01f9 (patch)
tree0aa758cb989c2763e4c4e7b0aa94fb3c280dddcc /sound/ppc/powermac.c
parent5815f5550b7f0dba3459cdb56c4977715fca3468 (diff)
downloadlinux-1076879744d1b7709d5b7556cfe038039fbc01f9.tar.bz2
ALSA: ppc: 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>
Diffstat (limited to 'sound/ppc/powermac.c')
-rw-r--r--sound/ppc/powermac.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 8abb521b4814..350a7c8f86dd 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -58,7 +58,7 @@ static int snd_pmac_probe(struct platform_device *devptr)
char *name_ext;
int err;
- err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+ err = snd_card_new(&devptr->dev, index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;
@@ -122,8 +122,6 @@ static int snd_pmac_probe(struct platform_device *devptr)
if (enable_beep)
snd_pmac_attach_beep(chip);
- snd_card_set_dev(card, &devptr->dev);
-
if ((err = snd_card_register(card)) < 0)
goto __error;