diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 07:03:56 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 04:58:21 -0500 |
commit | 4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (patch) | |
tree | 864a8549eae025d2108cefbb19bc61e18a9bc659 /sound/isa/ad1848 | |
parent | 5872f3f621f9f65342583a85ec93b00c0a697eda (diff) |
ALSA: isa: 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/isa/ad1848')
-rw-r--r-- | sound/isa/ad1848/ad1848.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c index e3f455bd85cd..093f22a464d7 100644 --- a/sound/isa/ad1848/ad1848.c +++ b/sound/isa/ad1848/ad1848.c | |||
@@ -91,7 +91,7 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n) | |||
91 | struct snd_pcm *pcm; | 91 | struct snd_pcm *pcm; |
92 | int error; | 92 | int error; |
93 | 93 | ||
94 | error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); | 94 | error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card); |
95 | if (error < 0) | 95 | if (error < 0) |
96 | return error; | 96 | return error; |
97 | 97 | ||
@@ -119,8 +119,6 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n) | |||
119 | if (thinkpad[n]) | 119 | if (thinkpad[n]) |
120 | strcat(card->longname, " [Thinkpad]"); | 120 | strcat(card->longname, " [Thinkpad]"); |
121 | 121 | ||
122 | snd_card_set_dev(card, dev); | ||
123 | |||
124 | error = snd_card_register(card); | 122 | error = snd_card_register(card); |
125 | if (error < 0) | 123 | if (error < 0) |
126 | goto out; | 124 | goto out; |