diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 07:03:56 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 04:58:21 -0500 |
commit | 4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (patch) | |
tree | 864a8549eae025d2108cefbb19bc61e18a9bc659 /sound/isa/sb/jazz16.c | |
parent | 5872f3f621f9f65342583a85ec93b00c0a697eda (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/sb/jazz16.c')
-rw-r--r-- | sound/isa/sb/jazz16.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c index 356a6308392f..90d2eba549e9 100644 --- a/sound/isa/sb/jazz16.c +++ b/sound/isa/sb/jazz16.c | |||
@@ -229,8 +229,8 @@ static int snd_jazz16_probe(struct device *devptr, unsigned int dev) | |||
229 | static int possible_dmas16[] = {5, 7, -1}; | 229 | static int possible_dmas16[] = {5, 7, -1}; |
230 | int err, xirq, xdma8, xdma16, xmpu_port, xmpu_irq; | 230 | int err, xirq, xdma8, xdma16, xmpu_port, xmpu_irq; |
231 | 231 | ||
232 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, | 232 | err = snd_card_new(devptr, index[dev], id[dev], THIS_MODULE, |
233 | sizeof(struct snd_card_jazz16), &card); | 233 | sizeof(struct snd_card_jazz16), &card); |
234 | if (err < 0) | 234 | if (err < 0) |
235 | return err; | 235 | return err; |
236 | 236 | ||
@@ -327,8 +327,6 @@ static int snd_jazz16_probe(struct device *devptr, unsigned int dev) | |||
327 | mpu_port[dev]); | 327 | mpu_port[dev]); |
328 | } | 328 | } |
329 | 329 | ||
330 | snd_card_set_dev(card, devptr); | ||
331 | |||
332 | err = snd_card_register(card); | 330 | err = snd_card_register(card); |
333 | if (err < 0) | 331 | if (err < 0) |
334 | goto err_free; | 332 | goto err_free; |