aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/galaxy/galaxy.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/galaxy/galaxy.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/galaxy/galaxy.c')
-rw-r--r--sound/isa/galaxy/galaxy.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/isa/galaxy/galaxy.c b/sound/isa/galaxy/galaxy.c
index 81244e7cea5b..1eb2b1ec0fd9 100644
--- a/sound/isa/galaxy/galaxy.c
+++ b/sound/isa/galaxy/galaxy.c
@@ -506,13 +506,11 @@ static int snd_galaxy_probe(struct device *dev, unsigned int n)
506 u8 type; 506 u8 type;
507 int err; 507 int err;
508 508
509 err = snd_card_create(index[n], id[n], THIS_MODULE, sizeof *galaxy, 509 err = snd_card_new(dev, index[n], id[n], THIS_MODULE,
510 &card); 510 sizeof(*galaxy), &card);
511 if (err < 0) 511 if (err < 0)
512 return err; 512 return err;
513 513
514 snd_card_set_dev(card, dev);
515
516 card->private_free = snd_galaxy_free; 514 card->private_free = snd_galaxy_free;
517 galaxy = card->private_data; 515 galaxy = card->private_data;
518 516