summaryrefslogtreecommitdiffstats
path: root/sound/usb/midi.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-01-11 11:33:34 +0100
committerTakashi Iwai <tiwai@suse.de>2016-01-29 07:36:10 +0100
commit79289e24194a9d099bf18f200894832c5760cd83 (patch)
tree6a686fddaaeae99cdf85f6c2645d92891bceab74 /sound/usb/midi.h
parentALSA: hda - Add new GPU codec ID 0x10de0083 to snd-hda (diff)
downloadlinux-79289e24194a9d099bf18f200894832c5760cd83.tar.xz
linux-79289e24194a9d099bf18f200894832c5760cd83.zip
ALSA: usb-audio: Refer to chip->usb_id for quirks and MIDI creation
This is a preliminary patch for the later change to allow a better quirk ID management. In the current USB-audio code, there are a few places looking at usb_device idVendor and idProduct fields directly even though we have already a static member in snd_usb_audio.usb_id. This patch modifies such codes to refer to the latter field. For achieving this, two slightly intensive changes have been done: - The snd_usb_audio object is set/reset via dev_getdrv() for the given USB device; it's needed for minimizing the changes for some existing quirks that take only usb_device object. - __snd_usbmidi_create() is introduced to receive the pre-given usb_id argument. The exported snd_usbmidi_create() is unchanged by calling this new function internally. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/midi.h')
-rw-r--r--sound/usb/midi.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/sound/usb/midi.h b/sound/usb/midi.h
index ad8a3211f8e7..5e25a3fd6c1d 100644
--- a/sound/usb/midi.h
+++ b/sound/usb/midi.h
@@ -39,10 +39,20 @@ struct snd_usb_midi_endpoint_info {
/* for QUIRK_MIDI_AKAI, data is NULL */
-int snd_usbmidi_create(struct snd_card *card,
+int __snd_usbmidi_create(struct snd_card *card,
+ struct usb_interface *iface,
+ struct list_head *midi_list,
+ const struct snd_usb_audio_quirk *quirk,
+ unsigned int usb_id);
+
+static inline int snd_usbmidi_create(struct snd_card *card,
struct usb_interface *iface,
struct list_head *midi_list,
- const struct snd_usb_audio_quirk *quirk);
+ const struct snd_usb_audio_quirk *quirk)
+{
+ return __snd_usbmidi_create(card, iface, midi_list, quirk, 0);
+}
+
void snd_usbmidi_input_stop(struct list_head *p);
void snd_usbmidi_input_start(struct list_head *p);
void snd_usbmidi_disconnect(struct list_head *p);