Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 - Two new dvb frontend drivers: mn88472 and mn88473
 - A new driver for some PCIe DVBSky cards
 - A new remote controller driver: meson-ir
 - One LIRC staging driver got rewritten and promoted to mainstream:
   igorplugusb
 - A new tuner driver (m88rs6000t)
 - The old omap2 media driver got removed from staging.  This driver
   uses an old DMA API and it is likely broken on recent kernels.
   Nobody cared enough to fix it
 - Media bus format moved to a separate header, as DRM will also use the
   definitions there
 - mem2mem_testdev were renamed to vim2m, in order to use the same
   naming convention taken by the other virtual test driver (vivid)
 - Added a new driver for coda SoC (coda-jpeg)
 - The cx88 driver got converted to use videobuf2 core
 - Make DMABUF export buffer to work with DMA Scatter/Gather and Vmalloc
   cores
 - Lots of other fixes, improvements and cleanups on the drivers.

* tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (384 commits)
  [media] mn88473: One function call less in mn88473_init() after error
  [media] mn88473: Remove uneeded check before release_firmware()
  [media] lirc_zilog: Deletion of unnecessary checks before vfree()
  [media] MAINTAINERS: Add myself as img-ir maintainer
  [media] img-ir: Don't set driver's module owner
  [media] img-ir: Depend on METAG or MIPS or COMPILE_TEST
  [media] img-ir/hw: Drop [un]register_decoder declarations
  [media] img-ir/hw: Fix potential deadlock stopping timer
  [media] img-ir/hw: Always read data to clear buffer
  [media] redrat3: ensure dma is setup properly
  [media] ddbridge: remove unneeded check before dvb_unregister_device()
  [media] si2157: One function call less in si2157_init() after error
  [media] tuners: remove uneeded checks before release_firmware()
  [media] arm: omap2: rx51-peripherals: fix build warning
  [media] stv090x: add an extra protetion against buffer overflow
  [media] stv090x: Remove an unreachable code
  [media] stv090x: Some whitespace cleanups
  [media] em28xx: checkpatch cleanup: whitespaces/new lines cleanups
  [media] si2168: add support for firmware files in new format
  [media] si2168: debug printout for firmware version
  ...

1 files changed, 39 insertions, 127 deletions

diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index c657752a420c..83bddbdb90e9 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2804,133 +2804,45 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
-/* Hauppauge HVR-950Q and HVR-850 */
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x7200),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x7217),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x721b),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x721e),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x721f),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-850",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
-{
-        USB_DEVICE_VENDOR_SPEC(0x0fd9, 0x0008),
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
-                       USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Hauppauge",
-                .product_name = "HVR-950Q",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_AUDIO_ALIGN_TRANSFER,
-        }
-},
+/*
+ * Auvitek au0828 devices with audio interface.
+ * This should be kept in sync with drivers/media/usb/au0828/au0828-cards.c
+ * Please notice that some drivers are DVB only, and don't need to be
+ * here. That's the case, for example, of DVICO_FUSIONHDTV7.
+ */
+
+#define AU0828_DEVICE(vid, pid, vname, pname) { \
+        USB_DEVICE_VENDOR_SPEC(vid, pid), \
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
+                       USB_DEVICE_ID_MATCH_INT_CLASS | \
+                       USB_DEVICE_ID_MATCH_INT_SUBCLASS, \
+        .bInterfaceClass = USB_CLASS_AUDIO, \
+        .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, \
+        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { \
+                .vendor_name = vname, \
+                .product_name = pname, \
+                .ifnum = QUIRK_ANY_INTERFACE, \
+                .type = QUIRK_AUDIO_ALIGN_TRANSFER, \
+        } \
+}
+
+AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"),
+AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7201, "Hauppauge", "HVR-950Q-MXL"),
+AU0828_DEVICE(0x2040, 0x7211, "Hauppauge", "HVR-950Q-MXL"),
+AU0828_DEVICE(0x2040, 0x7281, "Hauppauge", "HVR-950Q-MXL"),
+AU0828_DEVICE(0x05e1, 0x0480, "Hauppauge", "Woodbury"),
+AU0828_DEVICE(0x2040, 0x8200, "Hauppauge", "Woodbury"),
+AU0828_DEVICE(0x2040, 0x7260, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7213, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
 
 /* Digidesign Mbox */
 {