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/trident | |
| parent | 4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (diff) | |
| download | lwn-60c5772b50fe8ce947685cfe3a80b9bf6ea92831.tar.gz lwn-60c5772b50fe8ce947685cfe3a80b9bf6ea92831.zip | |
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/trident')
| -rw-r--r-- | sound/pci/trident/trident.c | 3 | ||||
| -rw-r--r-- | sound/pci/trident/trident_main.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index b3b588bc94c3..d852458caf38 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c @@ -89,7 +89,8 @@ static int snd_trident_probe(struct pci_dev *pci, return -ENOENT; } - err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, + 0, &card); if (err < 0) return err; diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index fb0e1586a6f8..4f3c4be30a48 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c @@ -3664,7 +3664,6 @@ int snd_trident_create(struct snd_card *card, snd_trident_enable_eso(trident); snd_trident_proc_init(trident); - snd_card_set_dev(card, &pci->dev); *rtrident = trident; return 0; } |