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

Pull ALSA sequencer cleanup.

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

diff --cc sound/core/seq/seq_clientmgr.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/usb/quirks-table.h
index cd27339,aaa6a51..8d22de8
--- 1/sound/usb/quirks-table.h
--- 2/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
                }
        }
  },