diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 14:20:19 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 11:17:52 +0100 |
| commit | 60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (patch) | |
| tree | ad2d8a112bd708ff58f96ccb2ec7b15d88676379 /sound/pci/als4000.c | |
| parent | 4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (diff) | |
| download | linux-60c5772b50fe8ce947685cfe3a80b9bf6ea92831.tar.bz2 | |
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.c | 7 |
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, pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO); pci_set_master(pci); - err = snd_card_create(index[dev], id[dev], THIS_MODULE, - sizeof(*acard) /* private_data: acard */, - &card); + err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, + sizeof(*acard) /* private_data: acard */, + &card); if (err < 0) { pci_release_regions(pci); pci_disable_device(pci); @@ -920,7 +920,6 @@ static int snd_card_als4000_probe(struct pci_dev *pci, chip->pci = pci; chip->alt_port = iobase; - snd_card_set_dev(card, &pci->dev); snd_als4000_configure(chip); |