diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:22:20 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 05:18:00 -0500 |
commit | 874b8d422e26e21dd432657e25f679c75440c1bc (patch) | |
tree | e88cbcfc629fc791e9310a968cdcd90bddbc4f10 /sound/usb/misc/ua101.c | |
parent | 60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (diff) |
ALSA: usb: 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/usb/misc/ua101.c')
-rw-r--r-- | sound/usb/misc/ua101.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c index 509315937f25..a1bab149df4d 100644 --- a/sound/usb/misc/ua101.c +++ b/sound/usb/misc/ua101.c | |||
@@ -1243,8 +1243,9 @@ static int ua101_probe(struct usb_interface *interface, | |||
1243 | mutex_unlock(&devices_mutex); | 1243 | mutex_unlock(&devices_mutex); |
1244 | return -ENOENT; | 1244 | return -ENOENT; |
1245 | } | 1245 | } |
1246 | err = snd_card_create(index[card_index], id[card_index], THIS_MODULE, | 1246 | err = snd_card_new(&interface->dev, |
1247 | sizeof(*ua), &card); | 1247 | index[card_index], id[card_index], THIS_MODULE, |
1248 | sizeof(*ua), &card); | ||
1248 | if (err < 0) { | 1249 | if (err < 0) { |
1249 | mutex_unlock(&devices_mutex); | 1250 | mutex_unlock(&devices_mutex); |
1250 | return err; | 1251 | return err; |
@@ -1283,8 +1284,6 @@ static int ua101_probe(struct usb_interface *interface, | |||
1283 | } | 1284 | } |
1284 | } | 1285 | } |
1285 | 1286 | ||
1286 | snd_card_set_dev(card, &interface->dev); | ||
1287 | |||
1288 | err = detect_usb_format(ua); | 1287 | err = detect_usb_format(ua); |
1289 | if (err < 0) | 1288 | if (err < 0) |
1290 | goto probe_error; | 1289 | goto probe_error; |