summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-prodikeys.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 14:46:08 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-14 08:14:09 +0100
commitb9d4e7b0f612ecf6a0a29a046efc4828703f63c4 (patch)
tree4ecb3176e76d1ed944f1ef8439ed83e60421c243 /drivers/hid/hid-prodikeys.c
parent102b5a8d4ac62d8ff4920b64da8b4b488ce67261 (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>
Diffstat (limited to 'drivers/hid/hid-prodikeys.c')
-rw-r--r--drivers/hid/hid-prodikeys.c5
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)
/* 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) {
pk_error("failed to create pc-midi sound card\n");
err = -ENOMEM;
@@ -660,8 +661,6 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm)
snd_rawmidi_set_ops(rwmidi, SNDRV_RAWMIDI_STREAM_INPUT,
&pcmidi_in_ops);
- snd_card_set_dev(card, &pm->pk->hdev->dev);
-
/* create sysfs variables */
err = device_create_file(&pm->pk->hdev->dev,
sysfs_device_attr_channel);