aboutsummaryrefslogtreecommitdiffstats
path: root/sound/aoa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 08:38:59 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-14 02:14:06 -0500
commit1076879744d1b7709d5b7556cfe038039fbc01f9 (patch)
tree0aa758cb989c2763e4c4e7b0aa94fb3c280dddcc /sound/aoa
parent5815f5550b7f0dba3459cdb56c4977715fca3468 (diff)
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/aoa')
-rw-r--r--sound/aoa/core/alsa.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c
index 0fa3855b4790..9913bf222073 100644
--- a/sound/aoa/core/alsa.c
+++ b/sound/aoa/core/alsa.c
@@ -23,13 +23,12 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
23 /* cannot be EEXIST due to usage in aoa_fabric_register */ 23 /* cannot be EEXIST due to usage in aoa_fabric_register */
24 return -EBUSY; 24 return -EBUSY;
25 25
26 err = snd_card_create(index, name, mod, sizeof(struct aoa_card), 26 err = snd_card_new(dev, index, name, mod, sizeof(struct aoa_card),
27 &alsa_card); 27 &alsa_card);
28 if (err < 0) 28 if (err < 0)
29 return err; 29 return err;
30 aoa_card = alsa_card->private_data; 30 aoa_card = alsa_card->private_data;
31 aoa_card->alsa_card = alsa_card; 31 aoa_card->alsa_card = alsa_card;
32 alsa_card->dev = dev;
33 strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver)); 32 strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver));
34 strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname)); 33 strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname));
35 strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname)); 34 strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname));