[ALSA] usb-audio: cosmetic changes

Modules: USB generic driver

Move some entries around to keep them sorted by ID.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 905e33e..7f7e371 100644 (file)
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1082,6 +1082,8 @@ static struct {
        { USB_ID(0x0582, 0x004d), 0, "%s MIDI" },
        { USB_ID(0x0582, 0x004d), 1, "%s 1" },
        { USB_ID(0x0582, 0x004d), 2, "%s 2" },
+       /* Edirol UM-3EX */
+       { USB_ID(0x0582, 0x009a), 3, "%s Control" },
        /* M-Audio MidiSport 8x8 */
        { USB_ID(0x0763, 0x1031), 8, "%s Control" },
        { USB_ID(0x0763, 0x1033), 8, "%s Control" },
@@ -1092,8 +1094,6 @@ static struct {
        { USB_ID(0x086a, 0x0001), 8, "%s Broadcast" },
        { USB_ID(0x086a, 0x0002), 8, "%s Broadcast" },
        { USB_ID(0x086a, 0x0003), 4, "%s Broadcast" },
-       /* Edirol UM-3ex */
-       { USB_ID(0x0582, 0x009a), 3, "%s Control" },
 };
 
 static void snd_usbmidi_init_substream(struct snd_usb_midi* umidi,

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 8f34861..381d9a8 100644 (file)
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -204,28 +204,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-       USB_DEVICE(0x0582, 0x009a),
-       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-               .vendor_name = "EDIROL",
-               .product_name = "UM-3ex",
-               .ifnum = QUIRK_ANY_INTERFACE,
-               .type = QUIRK_COMPOSITE,
-               .data = (const struct snd_usb_audio_quirk[]) {
-                       {
-                               .ifnum = 0,
-                               .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const struct snd_usb_midi_endpoint_info) {
-                                       .out_cables = 0x000f,
-                                       .in_cables  = 0x000f
-                               }
-                       },
-                       {
-                               .ifnum = -1
-                       }
-               }
-       }
-},
-{
        USB_DEVICE(0x0582, 0x0002),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
@@ -1112,6 +1090,27 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                }
        }
 },
+       /* TODO: add Edirol UA-101 support */
+       /* TODO: add Roland G-70 support */
+       /* TODO: add Roland V-SYNTH XT support */
+       /* TODO: add BOSS GT-PRO support */
+       /* TODO: add Edirol PC-50 support */
+       /* TODO: add Edirol PC-80 support */
+       /* TODO: add Edirol UA-1EX support */
+{
+       USB_DEVICE(0x0582, 0x009a),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "EDIROL",
+               .product_name = "UM-3EX",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_FIXED_ENDPOINT,
+               .data = & (const struct snd_usb_midi_endpoint_info) {
+                       .out_cables = 0x000f,
+                       .in_cables  = 0x000f
+               }
+       }
+},
+       /* TODO: add Edirol MD-P1 support */
 
 /* Guillemot devices */
 {
@@ -1133,15 +1132,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                }
        }
 },
-       /* TODO: add Edirol UA-101 support */
-       /* TODO: add Roland G-70 support */
-       /* TODO: add Roland V-SYNTH XT support */
-       /* TODO: add BOSS GT-PRO support */
-       /* TODO: add Edirol PC-50 support */
-       /* TODO: add Edirol PC-80 support */
-       /* TODO: add Edirol UA-1EX support */
-       /* TODO: add Edirol UM-3 support */
-       /* TODO: add Edirol MD-P1 support */
 
 /* Midiman/M-Audio devices */
 {