Commit b9d4e7b0 authored by Takashi Iwai's avatar Takashi Iwai

HID: prodikeys: 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 102b5a8d
...@@ -624,7 +624,8 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm) ...@@ -624,7 +624,8 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm)
/* Setup sound card */ /* Setup sound card */
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); err = snd_card_new(&pm->pk->hdev->dev, index[dev], id[dev],
THIS_MODULE, 0, &card);
if (err < 0) { if (err < 0) {
pk_error("failed to create pc-midi sound card\n"); pk_error("failed to create pc-midi sound card\n");
err = -ENOMEM; err = -ENOMEM;
...@@ -660,8 +661,6 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm) ...@@ -660,8 +661,6 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm)
snd_rawmidi_set_ops(rwmidi, SNDRV_RAWMIDI_STREAM_INPUT, snd_rawmidi_set_ops(rwmidi, SNDRV_RAWMIDI_STREAM_INPUT,
&pcmidi_in_ops); &pcmidi_in_ops);
snd_card_set_dev(card, &pm->pk->hdev->dev);
/* create sysfs variables */ /* create sysfs variables */
err = device_create_file(&pm->pk->hdev->dev, err = device_create_file(&pm->pk->hdev->dev,
sysfs_device_attr_channel); sysfs_device_attr_channel);
......
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