Merge remote-tracking branch 'usb/usb-next'

[karo-tx-linux.git] / include / linux / usb / storage.h

diff --git a/include/linux/usb/storage.h b/include/linux/usb/storage.h
index cb33fff2ba0be33f3aa6b764e78b402f948e9c4d..305ee8db7faf38617b1c9d71045732a230bc14b1 100644 (file)
--- a/include/linux/usb/storage.h
+++ b/include/linux/usb/storage.h
@@ -45,9 +45,9 @@
 
 #define USB_PR_DEVICE  0xff            /* Use device's value */
 
- /*
-  * Bulk only data structures
-  */
+/*
+ * Bulk only data structures
+ */
 
 /* command block wrapper */
 struct bulk_cb_wrap {
@@ -56,18 +56,18 @@ struct bulk_cb_wrap {
        __le32  DataTransferLength;     /* size of data */
        __u8    Flags;                  /* direction in bit 0 */
        __u8    Lun;                    /* LUN normally 0 */
-       __u8    Length;                 /* of of the CDB */
+       __u8    Length;                 /* length 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_CB_SIGN                0x43425355      /* spells out 'USBC' */
 #define US_BULK_FLAG_IN                (1 << 7)
 #define US_BULK_FLAG_OUT       0
 
 /* command status wrapper */
 struct bulk_cs_wrap {
-       __le32  Signature;      /* should = 'USBS' */
+       __le32  Signature;      /* contains 'USBS' */
        __u32   Tag;            /* same as original command */
        __le32  Residue;        /* amount not transferred */
        __u8    Status;         /* see below */