diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 12:03:56 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 09:58:21 (GMT) |
| commit | 4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (patch) | |
| tree | 864a8549eae025d2108cefbb19bc61e18a9bc659 /sound/isa/cmi8328.c | |
| parent | 5872f3f621f9f65342583a85ec93b00c0a697eda (diff) | |
| download | linux-4323cc4d5b25b5138c0791e3c7d3b09bd7062b49.tar.xz | |
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 ab6b2dc..4778852 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) } outb(val, port); - err = snd_card_create(index[ndev], id[ndev], THIS_MODULE, - sizeof(struct snd_cmi8328), &card); + err = snd_card_new(pdev, index[ndev], id[ndev], THIS_MODULE, + sizeof(struct snd_cmi8328), &card); if (err < 0) return err; cmi = card->private_data; cmi->card = card; cmi->port = port; cmi->wss_cfg = val; - snd_card_set_dev(card, pdev); err = snd_wss_create(card, port + 4, -1, irq[ndev], dma1[ndev], dma2[ndev], WSS_HW_DETECT, 0, &cmi->wss); |