aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/echoaudio
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/echoaudio
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/echoaudio')
-rw-r--r--sound/pci/echoaudio/echoaudio.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 05cfe551ce42..1ef77c0d39ec 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -2058,12 +2058,11 @@ static int snd_echo_probe(struct pci_dev *pci,
2058 2058
2059 DE_INIT(("Echoaudio driver starting...\n")); 2059 DE_INIT(("Echoaudio driver starting...\n"));
2060 i = 0; 2060 i = 0;
2061 err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); 2061 err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
2062 0, &card);
2062 if (err < 0) 2063 if (err < 0)
2063 return err; 2064 return err;
2064 2065
2065 snd_card_set_dev(card, &pci->dev);
2066
2067 chip = NULL; /* Tells snd_echo_create to allocate chip */ 2066 chip = NULL; /* Tells snd_echo_create to allocate chip */
2068 if ((err = snd_echo_create(card, pci, &chip)) < 0) { 2067 if ((err = snd_echo_create(card, pci, &chip)) < 0) {
2069 snd_card_free(card); 2068 snd_card_free(card);