Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4a87ef4 authored by Ben Williamson's avatar Ben Williamson Committed by Jaroslav Kysela
Browse files

[ALSA] USB midi: Remove duplicate CS_AUDIO_* #defines 



Removed the CS_AUDIO_* #defines, which were duplicates of the
class-specific USB_DT_CS_* #defines in <linux/usb_ch9.h>.

Signed-off-by: default avatarBen Williamson <ben.williamson@greyinnovation.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1561f09a

sound/usb/usbaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -2981,7 +2981,7 @@ static int create_ua1000_quirk(struct snd_usb_audio *chip, 
		return -ENXIO;

	alts = &iface->altsetting[1];

	altsd = get_iface_desc(alts);

	if (alts->extralen != 11 || alts->extra[1] != CS_AUDIO_INTERFACE ||

	if (alts->extralen != 11 || alts->extra[1] != USB_DT_CS_INTERFACE ||

	    altsd->bNumEndpoints != 1)

		return -ENXIO;

sound/usb/usbaudio.h

+0 −7
Original line number Diff line number Diff line
@@ -30,13 +30,6 @@ 
#define USB_SUBCLASS_MIDI_STREAMING	0x03

#define USB_SUBCLASS_VENDOR_SPEC	0xff



#define CS_AUDIO_UNDEFINED		0x20

#define CS_AUDIO_DEVICE			0x21

#define CS_AUDIO_CONFIGURATION		0x22

#define CS_AUDIO_STRING			0x23

#define CS_AUDIO_INTERFACE		0x24

#define CS_AUDIO_ENDPOINT		0x25



#define HEADER				0x01

#define INPUT_TERMINAL			0x02

#define OUTPUT_TERMINAL			0x03

sound/usb/usbmidi.c

+1 −1
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ static int snd_usbmidi_detect_yamaha(struct snd_usb_midi* umidi, 
	for (cs_desc = hostif->extra;

	     cs_desc < hostif->extra + hostif->extralen && cs_desc[0] >= 2;

	     cs_desc += cs_desc[0]) {

		if (cs_desc[1] == CS_AUDIO_INTERFACE) {

		if (cs_desc[1] == USB_DT_CS_INTERFACE) {

			if (cs_desc[2] == MIDI_IN_JACK)

				endpoint->in_cables = (endpoint->in_cables << 1) | 1;

			else if (cs_desc[2] == MIDI_OUT_JACK)