tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: usb-audio: Move generic implicit fb quirk entries into quirks.c

Use the new quirk bits to manage the generic implicit fb quirk
entries. This makes easier to compare with other devices.

Link: https://lore.kernel.org/r/20220421064101.12456-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai 67d64069 0f1f7a66

+6 -5
-5
sound/usb/implicit.c
··· 45 45 46 46 /* Implicit feedback quirk table for playback */ 47 47 static const struct snd_usb_implicit_fb_match playback_implicit_fb_quirks[] = { 48 - /* Generic matching */ 49 - IMPLICIT_FB_GENERIC_DEV(0x0499, 0x1509), /* Steinberg UR22 */ 50 - IMPLICIT_FB_GENERIC_DEV(0x0763, 0x2030), /* M-Audio Fast Track C400 */ 51 - IMPLICIT_FB_GENERIC_DEV(0x0763, 0x2031), /* M-Audio Fast Track C600 */ 52 - 53 48 /* Fixed EP */ 54 49 /* FIXME: check the availability of generic matching */ 55 50 IMPLICIT_FB_FIXED_DEV(0x0763, 0x2080, 0x81, 2), /* M-Audio FastTrack Ultra */
+6
sound/usb/quirks.c
··· 1793 1793 QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_IGNORE_CTL_ERROR), 1794 1794 DEVICE_FLG(0x046d, 0x09a4, /* Logitech QuickCam E 3500 */ 1795 1795 QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_IGNORE_CTL_ERROR), 1796 + DEVICE_FLG(0x0499, 0x1509, /* Steinberg UR22 */ 1797 + QUIRK_FLAG_GENERIC_IMPLICIT_FB), 1796 1798 DEVICE_FLG(0x04d8, 0xfeea, /* Benchmark DAC1 Pre */ 1797 1799 QUIRK_FLAG_GET_SAMPLE_RATE), 1798 1800 DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */ ··· 1826 1824 QUIRK_FLAG_IGNORE_CTL_ERROR), 1827 1825 DEVICE_FLG(0x074d, 0x3553, /* Outlaw RR2150 (Micronas UAC3553B) */ 1828 1826 QUIRK_FLAG_GET_SAMPLE_RATE), 1827 + DEVICE_FLG(0x0763, 0x2030, /* M-Audio Fast Track C400 */ 1828 + QUIRK_FLAG_GENERIC_IMPLICIT_FB), 1829 + DEVICE_FLG(0x0763, 0x2031, /* M-Audio Fast Track C600 */ 1830 + QUIRK_FLAG_GENERIC_IMPLICIT_FB), 1829 1831 DEVICE_FLG(0x08bb, 0x2702, /* LineX FM Transmitter */ 1830 1832 QUIRK_FLAG_IGNORE_CTL_ERROR), 1831 1833 DEVICE_FLG(0x0951, 0x16ad, /* Kingston HyperX */