summaryrefslogtreecommitdiffstats
path: root/sound/firewire/speakers.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 14:23:55 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-14 08:13:31 +0100
commit06b45f00a46621e0766e37a02a9676b9143261a2 (patch)
tree51b808f985a4eac75adc2208dd31016acd43ac29 /sound/firewire/speakers.c
parent874b8d422e26e21dd432657e25f679c75440c1bc (diff)
downloadtalos-op-linux-06b45f00a46621e0766e37a02a9676b9143261a2.tar.gz
talos-op-linux-06b45f00a46621e0766e37a02a9676b9143261a2.zip
ALSA: firewire: Convert to snd_card_new() with a device pointer
Also remove superfluous snd_card_set_dev() calls. Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/speakers.c')
-rw-r--r--sound/firewire/speakers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index cc8bc3a51bc1..9f7ef219b109 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -668,10 +668,10 @@ static int fwspk_probe(struct fw_unit *unit,
u32 firmware;
int err;
- err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*fwspk), &card);
+ err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE,
+ sizeof(*fwspk), &card);
if (err < 0)
return err;
- snd_card_set_dev(card, &unit->device);
fwspk = card->private_data;
fwspk->card = card;
OpenPOWER on IntegriCloud