usb/storage: a couple defines from drivers/usb/storage/transport.h to include/linux/usb/storage.h

This moves the BOT data structures for CBW and CSW from drivers internal
header file to global include able file in include/.
The storage gadget is using the same name for CSW but a different for
CBW so I fix it up properly. The same goes for the ub driver and keucr
driver in staging.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 19 deletions

diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 85ea14e2545e..4095696b1582 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -153,29 +153,10 @@
 
 /* Bulk-only data structures */
 
-/* Command Block Wrapper */
-struct fsg_bulk_cb_wrap {
-        __le32  Signature;              /* Contains 'USBC' */
-        u32     Tag;                    /* Unique per command id */
-        __le32  DataTransferLength;     /* Size of the data */
-        u8      Flags;                  /* Direction in bit 7 */
-        u8      Lun;                    /* LUN (normally 0) */
-        u8      Length;                 /* Of the CDB, <= MAX_COMMAND_SIZE */
-        u8      CDB[16];                /* Command Data Block */
-};
-
 #define USB_BULK_CB_WRAP_LEN    31
 #define USB_BULK_CB_SIG         0x43425355      /* Spells out USBC */
 #define USB_BULK_IN_FLAG        0x80
 
-/* 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 USB_BULK_CS_WRAP_LEN    13
 #define USB_BULK_CS_SIG         0x53425355      /* Spells out 'USBS' */
 #define USB_STATUS_PASS         0