aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/mixart
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 08:20:19 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-12 05:17:52 -0500
commit60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (patch)
treead2d8a112bd708ff58f96ccb2ec7b15d88676379 /sound/pci/mixart
parent4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (diff)
ALSA: pci: 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/pci/mixart')
-rw-r--r--sound/pci/mixart/mixart.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 1e0f6ee193f0..9ab057bb9859 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1028,8 +1028,6 @@ static int snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int
1028 } 1028 }
1029 1029
1030 mgr->chip[idx] = chip; 1030 mgr->chip[idx] = chip;
1031 snd_card_set_dev(card, &mgr->pci->dev);
1032
1033 return 0; 1031 return 0;
1034} 1032}
1035 1033
@@ -1308,7 +1306,8 @@ static int snd_mixart_probe(struct pci_dev *pci,
1308 else 1306 else
1309 idx = index[dev] + i; 1307 idx = index[dev] + i;
1310 snprintf(tmpid, sizeof(tmpid), "%s-%d", id[dev] ? id[dev] : "MIXART", i); 1308 snprintf(tmpid, sizeof(tmpid), "%s-%d", id[dev] ? id[dev] : "MIXART", i);
1311 err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card); 1309 err = snd_card_new(&pci->dev, idx, tmpid, THIS_MODULE,
1310 0, &card);
1312 1311
1313 if (err < 0) { 1312 if (err < 0) {
1314 snd_printk(KERN_ERR "cannot allocate the card %d\n", i); 1313 snd_printk(KERN_ERR "cannot allocate the card %d\n", i);