From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 19 Aug 2024 08:48:39 +0000 (+0200)
Subject: Merge branch 'topic/seq-filter-cleanup' into for-next
X-Git-Tag: v6.12-rc1~169^2~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41776e40082b06c79c3c069559d6ab6664394113;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'topic/seq-filter-cleanup' into for-next

Pull ALSA sequencer cleanup.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

41776e40082b06c79c3c069559d6ab6664394113
diff --cc sound/usb/quirks-table.h
index cd273397bc59a,aaa6a515d0f8a..8d22de8bc2a96
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@@ -324,16 -273,30 +324,17 @@@ YAMAHA_DEVICE(0x105a, NULL)
  YAMAHA_DEVICE(0x105b, NULL),
  YAMAHA_DEVICE(0x105c, NULL),
  YAMAHA_DEVICE(0x105d, NULL),
+ YAMAHA_DEVICE(0x1718, "P-125"),
  {
  	USB_DEVICE(0x0499, 0x1503),
 -	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
 +	QUIRK_DRIVER_INFO {
  		/* .vendor_name = "Yamaha", */
  		/* .product_name = "MOX6/MOX8", */
 -		.ifnum = QUIRK_ANY_INTERFACE,
 -		.type = QUIRK_COMPOSITE,
 -		.data = (const struct snd_usb_audio_quirk[]) {
 -			{
 -				.ifnum = 1,
 -				.type = QUIRK_AUDIO_STANDARD_INTERFACE
 -			},
 -			{
 -				.ifnum = 2,
 -				.type = QUIRK_AUDIO_STANDARD_INTERFACE
 -			},
 -			{
 -				.ifnum = 3,
 -				.type = QUIRK_MIDI_YAMAHA
 -			},
 -			{
 -				.ifnum = -1
 -			}
 +		QUIRK_DATA_COMPOSITE {
 +			{ QUIRK_DATA_STANDARD_AUDIO(1) },
 +			{ QUIRK_DATA_STANDARD_AUDIO(2) },
 +			{ QUIRK_DATA_MIDI_YAMAHA(3) },
 +			QUIRK_COMPOSITE_END
  		}
  	}
  },