Commit b029a940 authored by Takashi Iwai's avatar Takashi Iwai

staging/line6: Convert to snd_card_new() with a device pointer

Also remove superfluous snd_card_set_dev() calls.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 89235e55
...@@ -24,8 +24,9 @@ int line6_init_audio(struct usb_line6 *line6) ...@@ -24,8 +24,9 @@ int line6_init_audio(struct usb_line6 *line6)
struct snd_card *card; struct snd_card *card;
int err; int err;
err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, err = snd_card_new(line6->ifcdev,
THIS_MODULE, 0, &card); SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, 0, &card);
if (err < 0) if (err < 0)
return err; return err;
......
...@@ -307,8 +307,6 @@ int line6_init_midi(struct usb_line6 *line6) ...@@ -307,8 +307,6 @@ int line6_init_midi(struct usb_line6 *line6)
if (err < 0) if (err < 0)
return err; return err;
snd_card_set_dev(line6->card, line6->ifcdev);
err = snd_line6_new_midi(line6midi); err = snd_line6_new_midi(line6midi);
if (err < 0) if (err < 0)
return err; return err;
......
...@@ -501,8 +501,6 @@ int line6_init_pcm(struct usb_line6 *line6, ...@@ -501,8 +501,6 @@ int line6_init_pcm(struct usb_line6 *line6,
if (err < 0) if (err < 0)
return err; return err;
snd_card_set_dev(line6->card, line6->ifcdev);
err = snd_line6_new_pcm(line6pcm); err = snd_line6_new_pcm(line6pcm);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment