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

Pull USB merge for 3.4-rc1 from Greg KH:
 "Here's the big USB merge for the 3.4-rc1 merge window.

  Lots of gadget driver reworks here, driver updates, xhci changes, some
  new drivers added, usb-serial core reworking to fix some bugs, and
  other various minor things.

  There are some patches touching arch code, but they have all been
  acked by the various arch maintainers."

* tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (302 commits)
  net: qmi_wwan: add support for ZTE MF820D
  USB: option: add ZTE MF820D
  usb: gadget: f_fs: Remove lock is held before freeing checks
  USB: option: make interface blacklist work again
  usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver
  USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls
  USB: use generic platform driver on ath79
  USB: EHCI: Add a generic platform device driver
  USB: OHCI: Add a generic platform device driver
  USB: ftdi_sio: new PID: LUMEL PD12
  USB: ftdi_sio: add support for FT-X series devices
  USB: serial: mos7840: Fixed MCS7820 device attach problem
  usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.
  usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
  USB: ohci-nxp: Remove i2c_write(), use smbus
  USB: ohci-nxp: Support for LPC32xx
  USB: ohci-nxp: Rename symbols from pnx4008 to nxp
  USB: OHCI-HCD: Rename ohci-pnx4008 to ohci-nxp
  usb: gadget: Kconfig: fix typo for 'different'
  usb: dwc3: pci: fix another failure path in dwc3_pci_probe()
  ...

3 files changed, 8 insertions, 109 deletions

diff --git a/drivers/staging/keucr/transport.h b/drivers/staging/keucr/transport.h
index 4ae57d0145b2..2a11a98375d7 100644
--- a/drivers/staging/keucr/transport.h
+++ b/drivers/staging/keucr/transport.h
@@ -3,43 +3,6 @@
 
 #include <linux/blkdev.h>
 
-/* Bulk only data structures */
-
-/* command block wrapper */
-struct bulk_cb_wrap {
-        __le32  Signature;                      /* contains 'USBC' */
-        __u32   Tag;                            /* unique per command id */
-        __le32  DataTransferLength;     /* size of data */
-        __u8    Flags;                          /* direction in bit 0 */
-        __u8    Lun;                                    /* LUN normally 0 */
-        __u8    Length;                         /* of of the CDB */
-        __u8    CDB[16];                                /* max command */
-};
-
-#define US_BULK_CB_WRAP_LEN     31
-#define US_BULK_CB_SIGN         0x43425355      /*spells out USBC */
-#define US_BULK_FLAG_IN         1
-#define US_BULK_FLAG_OUT        0
-
-/* command status wrapper */
-struct bulk_cs_wrap {
-        __le32  Signature;              /* should = 'USBS' */
-        __u32           Tag;                    /* same as original command */
-        __le32  Residue;                /* amount not transferred */
-        __u8            Status;         /* see below */
-        __u8            Filler[18];
-};
-
-#define US_BULK_CS_WRAP_LEN     13
-#define US_BULK_CS_SIGN         0x53425355      /* spells out 'USBS' */
-#define US_BULK_STAT_OK         0
-#define US_BULK_STAT_FAIL       1
-#define US_BULK_STAT_PHASE      2
-
-/* bulk-only class specific requests */
-#define US_BULK_RESET_REQUEST   0xff
-#define US_BULK_GET_MAX_LUN     0xfe
-
 /* usb_stor_bulk_transfer_xxx() return codes, in order of severity */
 #define USB_STOR_XFER_GOOD      0       /* good transfer                 */
 #define USB_STOR_XFER_SHORT     1       /* transferred less than expected */
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
index 897a3a99c794..bb977e00cc86 100644
--- a/drivers/staging/quatech_usb2/quatech_usb2.c
+++ b/drivers/staging/quatech_usb2/quatech_usb2.c
@@ -135,7 +135,6 @@ static struct usb_driver quausb2_usb_driver = {
         .probe = usb_serial_probe,
         .disconnect = usb_serial_disconnect,
         .id_table = quausb2_id_table,
-        .no_dynamic_id = 1,
 };
 
 /**
@@ -1942,7 +1941,6 @@ static struct usb_serial_driver quatech2_device = {
                 .name = "quatech_usb2",
         },
         .description = DRIVER_DESC,
-        .usb_driver = &quausb2_usb_driver,
         .id_table = quausb2_id_table,
         .num_ports = 8,
         .open = qt2_open,
@@ -1964,41 +1962,11 @@ static struct usb_serial_driver quatech2_device = {
         .write_bulk_callback = qt2_write_bulk_callback,
 };
 
-static int __init quausb2_usb_init(void)
-{
-        int retval;
-
-        dbg("%s\n", __func__);
-
-        /* register with usb-serial */
-        retval = usb_serial_register(&quatech2_device);
-
-        if (retval)
-                goto failed_usb_serial_register;
-
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-                        DRIVER_DESC "\n");
-
-        /* register with usb */
-
-        retval = usb_register(&quausb2_usb_driver);
-        if (retval == 0)
-                return 0;
-
-        /* if we're here, usb_register() failed */
-        usb_serial_deregister(&quatech2_device);
-failed_usb_serial_register:
-                return retval;
-}
-
-static void __exit quausb2_usb_exit(void)
-{
-        usb_deregister(&quausb2_usb_driver);
-        usb_serial_deregister(&quatech2_device);
-}
+static struct usb_serial_driver * const serial_drivers[] = {
+        &quatech2_device, NULL
+};
 
-module_init(quausb2_usb_init);
-module_exit(quausb2_usb_exit);
+module_usb_serial_driver(quausb2_usb_driver, serial_drivers);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index 1c5780f1571b..ae1d815e2a53 100644
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@ -200,7 +200,6 @@ static struct usb_driver serqt_usb_driver = {
         .probe = usb_serial_probe,
         .disconnect = usb_serial_disconnect,
         .id_table = serqt_id_table,
-        .no_dynamic_id = 1,
 };
 
 static int port_paranoia_check(struct usb_serial_port *port,
@@ -1590,7 +1589,6 @@ static struct usb_serial_driver quatech_device = {
                    .name = "serqt",
                    },
         .description = DRIVER_DESC,
-        .usb_driver = &serqt_usb_driver,
         .id_table = serqt_id_table,
         .num_ports = 8,
         .open = qt_open,
@@ -1610,41 +1608,11 @@ static struct usb_serial_driver quatech_device = {
         .release = qt_release,
 };
 
-static int __init serqt_usb_init(void)
-{
-        int retval;
-
-        dbg("%s\n", __func__);
-
-        /* register with usb-serial */
-        retval = usb_serial_register(&quatech_device);
-
-        if (retval)
-                goto failed_usb_serial_register;
-
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-
-        /* register with usb */
-
-        retval = usb_register(&serqt_usb_driver);
-        if (retval == 0)
-                return 0;
-
-        /* if we're here, usb_register() failed */
-        usb_serial_deregister(&quatech_device);
-failed_usb_serial_register:
-        return retval;
-}
-
-static void __exit serqt_usb_exit(void)
-{
-        usb_deregister(&serqt_usb_driver);
-        usb_serial_deregister(&quatech_device);
-}
+static struct usb_serial_driver * const serial_drivers[] = {
+        &quatech_device, NULL
+};
 
-module_init(serqt_usb_init);
-module_exit(serqt_usb_exit);
+module_usb_serial_driver(serqt_usb_driver, serial_drivers);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);