diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-01-11 10:33:34 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-01-29 06:36:10 (GMT) |
commit | 79289e24194a9d099bf18f200894832c5760cd83 (patch) | |
tree | 6a686fddaaeae99cdf85f6c2645d92891bceab74 /sound/usb/quirks.h | |
parent | 3ec622f40913ae036f218e5e7e92df9c1f1753d9 (diff) | |
download | linux-79289e24194a9d099bf18f200894832c5760cd83.tar.xz |
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/quirks.h')
-rw-r--r-- | sound/usb/quirks.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h index 2cd71ed..192ff5c 100644 --- a/sound/usb/quirks.h +++ b/sound/usb/quirks.h @@ -16,7 +16,8 @@ int snd_usb_apply_interface_quirk(struct snd_usb_audio *chip, int snd_usb_apply_boot_quirk(struct usb_device *dev, struct usb_interface *intf, - const struct snd_usb_audio_quirk *quirk); + const struct snd_usb_audio_quirk *quirk, + unsigned int usb_id); void snd_usb_set_format_quirk(struct snd_usb_substream *subs, struct audioformat *fmt); |