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/cmi8328.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/cmi8328.c')
-rw-r--r-- | sound/isa/cmi8328.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c index ab6b2dc043f1..4778852a1201 100644 --- a/sound/isa/cmi8328.c +++ b/sound/isa/cmi8328.c | |||
@@ -293,15 +293,14 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev) | |||
293 | } | 293 | } |
294 | outb(val, port); | 294 | outb(val, port); |
295 | 295 | ||
296 | err = snd_card_create(index[ndev], id[ndev], THIS_MODULE, | 296 | err = snd_card_new(pdev, index[ndev], id[ndev], THIS_MODULE, |
297 | sizeof(struct snd_cmi8328), &card); | 297 | sizeof(struct snd_cmi8328), &card); |
298 | if (err < 0) | 298 | if (err < 0) |
299 | return err; | 299 | return err; |
300 | cmi = card->private_data; | 300 | cmi = card->private_data; |
301 | cmi->card = card; | 301 | cmi->card = card; |
302 | cmi->port = port; | 302 | cmi->port = port; |
303 | cmi->wss_cfg = val; | 303 | cmi->wss_cfg = val; |
304 | snd_card_set_dev(card, pdev); | ||
305 | 304 | ||
306 | err = snd_wss_create(card, port + 4, -1, irq[ndev], dma1[ndev], | 305 | err = snd_wss_create(card, port + 4, -1, irq[ndev], dma1[ndev], |
307 | dma2[ndev], WSS_HW_DETECT, 0, &cmi->wss); | 306 | dma2[ndev], WSS_HW_DETECT, 0, &cmi->wss); |