USB: storage: Use USB_ prefix instead of US_ prefix

This commit changes prefix for some of the USB mass storage
class related macros (ie. USB_SC_ for subclass and USB_PR_
for class).

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 30 insertions, 29 deletions

diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h
index a4b947e470a5..f387c436042e 100644
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -81,35 +81,36 @@ enum { US_DO_ALL_FLAGS };
 
 /* Sub Classes */
 
-#define US_SC_RBC       0x01            /* Typically, flash devices */
-#define US_SC_8020      0x02            /* CD-ROM */
-#define US_SC_QIC       0x03            /* QIC-157 Tapes */
-#define US_SC_UFI       0x04            /* Floppy */
-#define US_SC_8070      0x05            /* Removable media */
-#define US_SC_SCSI      0x06            /* Transparent */
-#define US_SC_LOCKABLE  0x07            /* Password-protected */
-
-#define US_SC_ISD200    0xf0            /* ISD200 ATA */
-#define US_SC_CYP_ATACB 0xf1            /* Cypress ATACB */
-#define US_SC_DEVICE    0xff            /* Use device's value */
-
-/* Protocols */
-
-#define US_PR_CBI       0x00            /* Control/Bulk/Interrupt */
-#define US_PR_CB        0x01            /* Control/Bulk w/o interrupt */
-#define US_PR_BULK      0x50            /* bulk only */
-
-#define US_PR_USBAT     0x80            /* SCM-ATAPI bridge */
-#define US_PR_EUSB_SDDR09       0x81    /* SCM-SCSI bridge for SDDR-09 */
-#define US_PR_SDDR55    0x82            /* SDDR-55 (made up) */
-#define US_PR_DPCM_USB  0xf0            /* Combination CB/SDDR09 */
-#define US_PR_FREECOM   0xf1            /* Freecom */
-#define US_PR_DATAFAB   0xf2            /* Datafab chipsets */
-#define US_PR_JUMPSHOT  0xf3            /* Lexar Jumpshot */
-#define US_PR_ALAUDA    0xf4            /* Alauda chipsets */
-#define US_PR_KARMA     0xf5            /* Rio Karma */
-
-#define US_PR_DEVICE    0xff            /* Use device's value */
+#define USB_SC_RBC      0x01            /* Typically, flash devices */
+#define USB_SC_8020     0x02            /* CD-ROM */
+#define USB_SC_QIC      0x03            /* QIC-157 Tapes */
+#define USB_SC_UFI      0x04            /* Floppy */
+#define USB_SC_8070     0x05            /* Removable media */
+#define USB_SC_SCSI     0x06            /* Transparent */
+#define USB_SC_LOCKABLE 0x07            /* Password-protected */
+
+#define USB_SC_ISD200   0xf0            /* ISD200 ATA */
+#define USB_SC_CYP_ATACB        0xf1    /* Cypress ATACB */
+#define USB_SC_DEVICE   0xff            /* Use device's value */
+
+/* Storage protocol codes */
+
+#define USB_PR_CBI      0x00            /* Control/Bulk/Interrupt */
+#define USB_PR_CB       0x01            /* Control/Bulk w/o interrupt */
+#define USB_PR_BULK     0x50            /* bulk only */
+#define USB_PR_UAS      0x62            /* USB Attached SCSI */
+
+#define USB_PR_USBAT    0x80            /* SCM-ATAPI bridge */
+#define USB_PR_EUSB_SDDR09      0x81    /* SCM-SCSI bridge for SDDR-09 */
+#define USB_PR_SDDR55   0x82            /* SDDR-55 (made up) */
+#define USB_PR_DPCM_USB 0xf0            /* Combination CB/SDDR09 */
+#define USB_PR_FREECOM  0xf1            /* Freecom */
+#define USB_PR_DATAFAB  0xf2            /* Datafab chipsets */
+#define USB_PR_JUMPSHOT 0xf3            /* Lexar Jumpshot */
+#define USB_PR_ALAUDA   0xf4            /* Alauda chipsets */
+#define USB_PR_KARMA    0xf5            /* Rio Karma */
+
+#define USB_PR_DEVICE   0xff            /* Use device's value */
 
 /*
  */