summaryrefslogtreecommitdiffstats
path: root/sound/ppc/snd_ps3.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/snd_ps3.c
parentALSA: pcmcia: Convert to snd_card_new() with a device pointer (diff)
downloadlinux-1076879744d1b7709d5b7556cfe038039fbc01f9.tar.xz
linux-1076879744d1b7709d5b7556cfe038039fbc01f9.zip
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/snd_ps3.c')
-rw-r--r--sound/ppc/snd_ps3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index ebb76f2d90d7..58f292a87f98 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -984,7 +984,8 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
}
/* create card instance */
- ret = snd_card_create(index, id, THIS_MODULE, 0, &the_card.card);
+ ret = snd_card_new(&dev->core, index, id, THIS_MODULE,
+ 0, &the_card.card);
if (ret < 0)
goto clean_irq;
@@ -1052,7 +1053,6 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
snd_ps3_init_avsetting(&the_card);
/* register the card */
- snd_card_set_dev(the_card.card, &dev->core);
ret = snd_card_register(the_card.card);
if (ret < 0)
goto clean_dma_map;