summaryrefslogtreecommitdiffstats
path: root/sound/pci/als4000.c
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/als4000.c
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/als4000.c')
-rw-r--r--sound/pci/als4000.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index ffc821b0139e..2b2bb0fa3bc7 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -888,9 +888,9 @@ static int snd_card_als4000_probe(struct pci_dev *pci,
888 pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO); 888 pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO);
889 pci_set_master(pci); 889 pci_set_master(pci);
890 890
891 err = snd_card_create(index[dev], id[dev], THIS_MODULE, 891 err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
892 sizeof(*acard) /* private_data: acard */, 892 sizeof(*acard) /* private_data: acard */,
893 &card); 893 &card);
894 if (err < 0) { 894 if (err < 0) {
895 pci_release_regions(pci); 895 pci_release_regions(pci);
896 pci_disable_device(pci); 896 pci_disable_device(pci);
@@ -920,7 +920,6 @@ static int snd_card_als4000_probe(struct pci_dev *pci,
920 920
921 chip->pci = pci; 921 chip->pci = pci;
922 chip->alt_port = iobase; 922 chip->alt_port = iobase;
923 snd_card_set_dev(card, &pci->dev);
924 923
925 snd_als4000_configure(chip); 924 snd_als4000_configure(chip);
926 925