aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gusmax.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 07:03:56 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-12 04:58:21 -0500
commit4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (patch)
tree864a8549eae025d2108cefbb19bc61e18a9bc659 /sound/isa/gus/gusmax.c
parent5872f3f621f9f65342583a85ec93b00c0a697eda (diff)
ALSA: isa: 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/isa/gus/gusmax.c')
-rw-r--r--sound/isa/gus/gusmax.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index 652d5d834620..39df36ca3acb 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -214,8 +214,8 @@ static int snd_gusmax_probe(struct device *pdev, unsigned int dev)
214 struct snd_wss *wss; 214 struct snd_wss *wss;
215 struct snd_gusmax *maxcard; 215 struct snd_gusmax *maxcard;
216 216
217 err = snd_card_create(index[dev], id[dev], THIS_MODULE, 217 err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
218 sizeof(struct snd_gusmax), &card); 218 sizeof(struct snd_gusmax), &card);
219 if (err < 0) 219 if (err < 0)
220 return err; 220 return err;
221 card->private_free = snd_gusmax_free; 221 card->private_free = snd_gusmax_free;
@@ -337,8 +337,6 @@ static int snd_gusmax_probe(struct device *pdev, unsigned int dev)
337 if (xdma2 >= 0) 337 if (xdma2 >= 0)
338 sprintf(card->longname + strlen(card->longname), "&%i", xdma2); 338 sprintf(card->longname + strlen(card->longname), "&%i", xdma2);
339 339
340 snd_card_set_dev(card, pdev);
341
342 err = snd_card_register(card); 340 err = snd_card_register(card);
343 if (err < 0) 341 if (err < 0)
344 goto _err; 342 goto _err;