Revert "ALSA: usb-audio: Add quirk for Focusrite Scarlett

This reverts commit 1762a59d8e8b5e99f6f4a0f292b40f3cacb108ba.

This quirk is not needed because support for the Scarlett mixers will be added.

Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 13f44fd..013cba8 100644 (file)
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2667,57 +2667,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                .type = QUIRK_MIDI_NOVATION
        }
 },
-{
-       /*
-        * Focusrite Scarlett 18i6
-        *
-        * Avoid mixer creation, which otherwise fails because some of
-        * the interface descriptor subtypes for interface 0 are
-        * unknown.  That should be fixed or worked-around but this at
-        * least allows the device to be used successfully with a DAW
-        * and an external mixer.  See comments below about other
-        * ignored interfaces.
-        */
-       USB_DEVICE(0x1235, 0x8004),
-       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-               .vendor_name = "Focusrite",
-               .product_name = "Scarlett 18i6",
-               .ifnum = QUIRK_ANY_INTERFACE,
-               .type = QUIRK_COMPOSITE,
-               .data = & (const struct snd_usb_audio_quirk[]) {
-                       {
-                               /* InterfaceSubClass 1 (Control Device) */
-                               .ifnum = 0,
-                               .type = QUIRK_IGNORE_INTERFACE
-                       },
-                       {
-                               .ifnum = 1,
-                               .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                       },
-                       {
-                               .ifnum = 2,
-                               .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                       },
-                       {
-                               /* InterfaceSubClass 1 (Control Device) */
-                               .ifnum = 3,
-                               .type = QUIRK_IGNORE_INTERFACE
-                       },
-                       {
-                               .ifnum = 4,
-                               .type = QUIRK_MIDI_STANDARD_INTERFACE
-                       },
-                       {
-                               /* InterfaceSubClass 1 (Device Firmware Update) */
-                               .ifnum = 5,
-                               .type = QUIRK_IGNORE_INTERFACE
-                       },
-                       {
-                               .ifnum = -1
-                       }
-               }
-       }
-},
 
 /* Access Music devices */
 {