summaryrefslogtreecommitdiff
path: root/sound/parisc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 17:35:40 +0400
committerTakashi Iwai <tiwai@suse.de>2014-02-14 11:14:05 +0400
commit5f32c314f9c2a4e2e88de3ef23aa35580a0a19e5 (patch)
tree42fc983bc5e26f5c2f4608019266916ba6bf9452 /sound/parisc
parentbee1bb19cf97413494a5254de63d43d52d93d4f8 (diff)
downloadlinux-5f32c314f9c2a4e2e88de3ef23aa35580a0a19e5.tar.xz
ALSA: parisc: 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/parisc')
-rw-r--r--sound/parisc/harmony.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 67f56a2cee6a..4b20be79c1dd 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -959,8 +959,6 @@ snd_harmony_create(struct snd_card *card,
goto free_and_ret;
}
- snd_card_set_dev(card, &padev->dev);
-
*rchip = h;
return 0;
@@ -977,7 +975,7 @@ snd_harmony_probe(struct parisc_device *padev)
struct snd_card *card;
struct snd_harmony *h;
- err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+ err = snd_card_new(&padev->dev, index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;