summaryrefslogtreecommitdiff
path: root/sound/usb/midi.c
diff options
context:
space:
mode:
authorGeorge Harker <george@george-graphics.co.uk>2021-02-27 00:24:56 +0300
committerTakashi Iwai <tiwai@suse.de>2021-03-01 11:21:44 +0300
commitd6e68c57e35b69b31d9fa5a61b37c840973db362 (patch)
treeab8167604a38b69b3883ec6e456b593f86e67b1c /sound/usb/midi.c
parentd9c05d22da797297e66fe3e6b9edbef86352be1c (diff)
downloadlinux-d6e68c57e35b69b31d9fa5a61b37c840973db362.tar.xz
ALSA: usb-audio: use usb headers rather than define structs locally
Use struct definitions from linux/usb/midi.h rather than locally define the structs in sound/usb/midi.c. Signed-off-by: George Harker <george@george-graphics.co.uk> Link: https://lore.kernel.org/r/20210226212457.24538-1-george@george-graphics.co.uk Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/midi.c')
-rw-r--r--sound/usb/midi.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 0c23fa6d8525..610cf54eefd9 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -47,6 +47,7 @@
#include <linux/usb.h>
#include <linux/wait.h>
#include <linux/usb/audio.h>
+#include <linux/usb/midi.h>
#include <linux/module.h>
#include <sound/core.h>
@@ -77,23 +78,6 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
MODULE_DESCRIPTION("USB Audio/MIDI helper module");
MODULE_LICENSE("Dual BSD/GPL");
-
-struct usb_ms_header_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bcdMSC[2];
- __le16 wTotalLength;
-} __attribute__ ((packed));
-
-struct usb_ms_endpoint_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bNumEmbMIDIJack;
- __u8 baAssocJackID[];
-} __attribute__ ((packed));
-
struct snd_usb_midi_in_endpoint;
struct snd_usb_midi_out_endpoint;
struct snd_usb_midi_endpoint;
@@ -1875,7 +1859,7 @@ static int snd_usbmidi_get_ms_info(struct snd_usb_midi *umidi,
ms_header->bDescriptorType == USB_DT_CS_INTERFACE &&
ms_header->bDescriptorSubtype == UAC_HEADER)
dev_dbg(&umidi->dev->dev, "MIDIStreaming version %02x.%02x\n",
- ms_header->bcdMSC[1], ms_header->bcdMSC[0]);
+ ((uint8_t *)&ms_header->bcdMSC)[1], ((uint8_t *)&ms_header->bcdMSC)[0]);
else
dev_warn(&umidi->dev->dev,
"MIDIStreaming interface descriptor not found\n");