Merge tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg Kroah-Hartman:
 "Here are the USB patches against your 3.7-rc1 tree.

  There are the usual UABI header file movements, and we finally are now
  able to remove the dbg() macro that is over 15 years old (that had to
  wait for after some other trees got merged into yours during the big
  3.7-rc1 merge window.)

  Other than that, nothing major, just a number of bugfixes and new
  device ids.  It turns out that almost all of the usb-serial drivers
  had bugs in how they were handling their internal data, leaking
  memory, hence all of those fixups.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (42 commits)
  USB: option: add more ZTE devices
  USB: option: blacklist net interface on ZTE devices
  usb: host: xhci: New system added for Compliance Mode Patch on SN65LVPE502CP
  USB: io_ti: fix sysfs-attribute creation
  USB: iuu_phoenix: fix sysfs-attribute creation
  USB: spcp8x5: fix port-data memory leak
  USB: ssu100: fix port-data memory leak
  USB: ti_usb_3410_5052: fix port-data memory leak
  USB: oti6858: fix port-data memory leak
  USB: iuu_phoenix: fix port-data memory leak
  USB: kl5kusb105: fix port-data memory leak
  USB: io_ti: fix port-data memory leak
  USB: keyspan_pda: fix port-data memory leak
  USB: f81232: fix port-data memory leak
  USB: io_edgeport: fix port-data memory leak
  USB: kobil_sct: fix port-data memory leak
  USB: cypress_m8: fix port-data memory leak
  usb: acm: fix the computation of the number of data bits
  usb: Missing dma_mask in ehci-vt8500.c when probed from device-tree
  usb: Missing dma_mask in uhci-platform.c when probed from device-tree
  ...

12 files changed, 3 insertions, 3193 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 07915a32fb9d..10278d18709c 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1778,17 +1778,6 @@ static inline int usb_translate_errors(int error_code)
 extern void usb_register_notify(struct notifier_block *nb);
 extern void usb_unregister_notify(struct notifier_block *nb);
 
-#ifdef DEBUG
-#define dbg(format, arg...)                                             \
-        printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg)
-#else
-#define dbg(format, arg...)                                             \
-do {                                                                    \
-        if (0)                                                          \
-                printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
-} while (0)
-#endif
-
 /* debugfs stuff */
 extern struct dentry *usb_debug_root;
 
diff --git a/include/linux/usb/Kbuild b/include/linux/usb/Kbuild
index b607f3532e88..e69de29bb2d1 100644
--- a/include/linux/usb/Kbuild
+++ b/include/linux/usb/Kbuild
@@ -1,10 +0,0 @@
-header-y += audio.h
-header-y += cdc.h
-header-y += ch9.h
-header-y += ch11.h
-header-y += functionfs.h
-header-y += gadgetfs.h
-header-y += midi.h
-header-y += g_printer.h
-header-y += tmc.h
-header-y += video.h
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index a54b8255d75f..3d84619110a4 100644
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -17,531 +17,11 @@
  * Types and defines in this file are either specific to version 1.0 of
  * this standard or common for newer versions.
  */
-
 #ifndef __LINUX_USB_AUDIO_H
 #define __LINUX_USB_AUDIO_H
 
-#include <linux/types.h>
-
-/* bInterfaceProtocol values to denote the version of the standard used */
-#define UAC_VERSION_1                   0x00
-#define UAC_VERSION_2                   0x20
-
-/* A.2 Audio Interface Subclass Codes */
-#define USB_SUBCLASS_AUDIOCONTROL       0x01
-#define USB_SUBCLASS_AUDIOSTREAMING     0x02
-#define USB_SUBCLASS_MIDISTREAMING      0x03
-
-/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
-#define UAC_HEADER                      0x01
-#define UAC_INPUT_TERMINAL              0x02
-#define UAC_OUTPUT_TERMINAL             0x03
-#define UAC_MIXER_UNIT                  0x04
-#define UAC_SELECTOR_UNIT               0x05
-#define UAC_FEATURE_UNIT                0x06
-#define UAC1_PROCESSING_UNIT            0x07
-#define UAC1_EXTENSION_UNIT             0x08
-
-/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
-#define UAC_AS_GENERAL                  0x01
-#define UAC_FORMAT_TYPE                 0x02
-#define UAC_FORMAT_SPECIFIC             0x03
-
-/* A.7 Processing Unit Process Types */
-#define UAC_PROCESS_UNDEFINED           0x00
-#define UAC_PROCESS_UP_DOWNMIX          0x01
-#define UAC_PROCESS_DOLBY_PROLOGIC      0x02
-#define UAC_PROCESS_STEREO_EXTENDER     0x03
-#define UAC_PROCESS_REVERB              0x04
-#define UAC_PROCESS_CHORUS              0x05
-#define UAC_PROCESS_DYN_RANGE_COMP      0x06
-
-/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_EP_GENERAL                  0x01
-
-/* A.9 Audio Class-Specific Request Codes */
-#define UAC_SET_                        0x00
-#define UAC_GET_                        0x80
-
-#define UAC__CUR                        0x1
-#define UAC__MIN                        0x2
-#define UAC__MAX                        0x3
-#define UAC__RES                        0x4
-#define UAC__MEM                        0x5
-
-#define UAC_SET_CUR                     (UAC_SET_ | UAC__CUR)
-#define UAC_GET_CUR                     (UAC_GET_ | UAC__CUR)
-#define UAC_SET_MIN                     (UAC_SET_ | UAC__MIN)
-#define UAC_GET_MIN                     (UAC_GET_ | UAC__MIN)
-#define UAC_SET_MAX                     (UAC_SET_ | UAC__MAX)
-#define UAC_GET_MAX                     (UAC_GET_ | UAC__MAX)
-#define UAC_SET_RES                     (UAC_SET_ | UAC__RES)
-#define UAC_GET_RES                     (UAC_GET_ | UAC__RES)
-#define UAC_SET_MEM                     (UAC_SET_ | UAC__MEM)
-#define UAC_GET_MEM                     (UAC_GET_ | UAC__MEM)
-
-#define UAC_GET_STAT                    0xff
-
-/* A.10 Control Selector Codes */
-
-/* A.10.1 Terminal Control Selectors */
-#define UAC_TERM_COPY_PROTECT           0x01
-
-/* A.10.2 Feature Unit Control Selectors */
-#define UAC_FU_MUTE                     0x01
-#define UAC_FU_VOLUME                   0x02
-#define UAC_FU_BASS                     0x03
-#define UAC_FU_MID                      0x04
-#define UAC_FU_TREBLE                   0x05
-#define UAC_FU_GRAPHIC_EQUALIZER        0x06
-#define UAC_FU_AUTOMATIC_GAIN           0x07
-#define UAC_FU_DELAY                    0x08
-#define UAC_FU_BASS_BOOST               0x09
-#define UAC_FU_LOUDNESS                 0x0a
-
-#define UAC_CONTROL_BIT(CS)     (1 << ((CS) - 1))
-
-/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
-#define UAC_UD_ENABLE                   0x01
-#define UAC_UD_MODE_SELECT              0x02
-
-/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
-#define UAC_DP_ENABLE                   0x01
-#define UAC_DP_MODE_SELECT              0x02
-
-/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
-#define UAC_3D_ENABLE                   0x01
-#define UAC_3D_SPACE                    0x02
-
-/* A.10.3.4 Reverberation Processing Unit Control Selectors */
-#define UAC_REVERB_ENABLE               0x01
-#define UAC_REVERB_LEVEL                0x02
-#define UAC_REVERB_TIME                 0x03
-#define UAC_REVERB_FEEDBACK             0x04
-
-/* A.10.3.5 Chorus Processing Unit Control Selectors */
-#define UAC_CHORUS_ENABLE               0x01
-#define UAC_CHORUS_LEVEL                0x02
-#define UAC_CHORUS_RATE                 0x03
-#define UAC_CHORUS_DEPTH                0x04
-
-/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
-#define UAC_DCR_ENABLE                  0x01
-#define UAC_DCR_RATE                    0x02
-#define UAC_DCR_MAXAMPL                 0x03
-#define UAC_DCR_THRESHOLD               0x04
-#define UAC_DCR_ATTACK_TIME             0x05
-#define UAC_DCR_RELEASE_TIME            0x06
-
-/* A.10.4 Extension Unit Control Selectors */
-#define UAC_XU_ENABLE                   0x01
-
-/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
-#define UAC_MS_HEADER                   0x01
+#include <uapi/linux/usb/audio.h>