diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:46:08 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 02:14:09 -0500 |
commit | b9d4e7b0f612ecf6a0a29a046efc4828703f63c4 (patch) | |
tree | 4ecb3176e76d1ed944f1ef8439ed83e60421c243 | |
parent | 102b5a8d4ac62d8ff4920b64da8b4b488ce67261 (diff) |
HID: prodikeys: 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>
-rw-r--r-- | drivers/hid/hid-prodikeys.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c index 7ed828056414..91fab975063c 100644 --- a/drivers/hid/hid-prodikeys.c +++ b/drivers/hid/hid-prodikeys.c | |||
@@ -624,7 +624,8 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm) | |||
624 | 624 | ||
625 | /* Setup sound card */ | 625 | /* Setup sound card */ |
626 | 626 | ||
627 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 627 | err = snd_card_new(&pm->pk->hdev->dev, index[dev], id[dev], |
628 | THIS_MODULE, 0, &card); | ||
628 | if (err < 0) { | 629 | if (err < 0) { |
629 | pk_error("failed to create pc-midi sound card\n"); | 630 | pk_error("failed to create pc-midi sound card\n"); |
630 | err = -ENOMEM; | 631 | err = -ENOMEM; |
@@ -660,8 +661,6 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm) | |||
660 | snd_rawmidi_set_ops(rwmidi, SNDRV_RAWMIDI_STREAM_INPUT, | 661 | snd_rawmidi_set_ops(rwmidi, SNDRV_RAWMIDI_STREAM_INPUT, |
661 | &pcmidi_in_ops); | 662 | &pcmidi_in_ops); |
662 | 663 | ||
663 | snd_card_set_dev(card, &pm->pk->hdev->dev); | ||
664 | |||
665 | /* create sysfs variables */ | 664 | /* create sysfs variables */ |
666 | err = device_create_file(&pm->pk->hdev->dev, | 665 | err = device_create_file(&pm->pk->hdev->dev, |
667 | sysfs_device_attr_channel); | 666 | sysfs_device_attr_channel); |