[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: Ben Williamson <ben.williamson@greyinnovation.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 30cadec9a340bd9b4a1e4fd982f9baea6c012dc1..627de9525a32594b2ce2fcb84325b43189cbc0a6 100644 (file)
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -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;
 

diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 88733524d0fb1c78fde79bd6e6d0e10f5affd300..0f4b2b8541d6a54e1d2deeb6bf6e49324bba9933 100644 (file)
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -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

diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 5c53ec8a13bf5bbf27d1b0d38b50453423191b45..5105b6b057484ffb0408e509e90f70a45e3d799e 100644 (file)
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -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)