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/lola | |
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/lola')
-rw-r--r-- | sound/pci/lola/lola.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c index 0568540dc8d3..56d4f94daea2 100644 --- a/sound/pci/lola/lola.c +++ b/sound/pci/lola/lola.c | |||
@@ -717,14 +717,13 @@ static int lola_probe(struct pci_dev *pci, | |||
717 | return -ENOENT; | 717 | return -ENOENT; |
718 | } | 718 | } |
719 | 719 | ||
720 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 720 | err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, |
721 | 0, &card); | ||
721 | if (err < 0) { | 722 | if (err < 0) { |
722 | snd_printk(KERN_ERR SFX "Error creating card!\n"); | 723 | snd_printk(KERN_ERR SFX "Error creating card!\n"); |
723 | return err; | 724 | return err; |
724 | } | 725 | } |
725 | 726 | ||
726 | snd_card_set_dev(card, &pci->dev); | ||
727 | |||
728 | err = lola_create(card, pci, dev, &chip); | 727 | err = lola_create(card, pci, dev, &chip); |
729 | if (err < 0) | 728 | if (err < 0) |
730 | goto out_free; | 729 | goto out_free; |