diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:20:19 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 05:17:52 -0500 |
commit | 60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (patch) | |
tree | ad2d8a112bd708ff58f96ccb2ec7b15d88676379 /sound/pci/pcxhr | |
parent | 4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (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/pcxhr')
-rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index d379b284955b..3880f6da9a87 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
@@ -1239,7 +1239,6 @@ static int pcxhr_create(struct pcxhr_mgr *mgr, | |||
1239 | } | 1239 | } |
1240 | 1240 | ||
1241 | mgr->chip[idx] = chip; | 1241 | mgr->chip[idx] = chip; |
1242 | snd_card_set_dev(card, &mgr->pci->dev); | ||
1243 | 1242 | ||
1244 | return 0; | 1243 | return 0; |
1245 | } | 1244 | } |
@@ -1638,7 +1637,8 @@ static int pcxhr_probe(struct pci_dev *pci, | |||
1638 | 1637 | ||
1639 | snprintf(tmpid, sizeof(tmpid), "%s-%d", | 1638 | snprintf(tmpid, sizeof(tmpid), "%s-%d", |
1640 | id[dev] ? id[dev] : card_name, i); | 1639 | id[dev] ? id[dev] : card_name, i); |
1641 | err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card); | 1640 | err = snd_card_new(&pci->dev, idx, tmpid, THIS_MODULE, |
1641 | 0, &card); | ||
1642 | 1642 | ||
1643 | if (err < 0) { | 1643 | if (err < 0) { |
1644 | snd_printk(KERN_ERR "cannot allocate the card %d\n", i); | 1644 | snd_printk(KERN_ERR "cannot allocate the card %d\n", i); |