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()
  ...

2 files changed, 3 insertions, 38 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 4e4c8a4a5fd3..a796407123c7 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -354,7 +354,7 @@ config BLK_DEV_SX8
           Use devices /dev/sx8/$N and /dev/sx8/$Np$M.
 
 config BLK_DEV_UB
-        tristate "Low Performance USB Block driver"
+        tristate "Low Performance USB Block driver (deprecated)"
         depends on USB
         help
           This driver supports certain USB attached storage devices
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 7333b9e44411..fcec0225ac76 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -119,43 +119,6 @@
 
 /*
  */
-
-/* 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 */
-        u8      Length;                 /* of of the CDB */
-        u8      CDB[UB_MAX_CDB_SIZE];   /* 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 */
-};
-
-#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
-
-/*
- */
 struct ub_dev;
 
 #define UB_MAX_REQ_SG   9       /* cdrecord requires 32KB and maybe a header */
@@ -2477,6 +2440,8 @@ static int __init ub_init(void)
         int rc;
         int i;
 
+        pr_info("'Low Performance USB Block' driver is deprecated. "
+                        "Please switch to usb-storage\n");
         for (i = 0; i < UB_QLOCK_NUM; i++)
                 spin_lock_init(&ub_qlockv[i]);