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/ca0106 | |
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/ca0106')
-rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index f4db5587e86e..f659c7a89c0c 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1843,7 +1843,8 @@ static int snd_ca0106_probe(struct pci_dev *pci, | |||
1843 | return -ENOENT; | 1843 | return -ENOENT; |
1844 | } | 1844 | } |
1845 | 1845 | ||
1846 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 1846 | err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, |
1847 | 0, &card); | ||
1847 | if (err < 0) | 1848 | if (err < 0) |
1848 | return err; | 1849 | return err; |
1849 | 1850 | ||
@@ -1878,8 +1879,6 @@ static int snd_ca0106_probe(struct pci_dev *pci, | |||
1878 | snd_ca0106_proc_init(chip); | 1879 | snd_ca0106_proc_init(chip); |
1879 | #endif | 1880 | #endif |
1880 | 1881 | ||
1881 | snd_card_set_dev(card, &pci->dev); | ||
1882 | |||
1883 | err = snd_card_register(card); | 1882 | err = snd_card_register(card); |
1884 | if (err < 0) | 1883 | if (err < 0) |
1885 | goto error; | 1884 | goto error; |