USB: storage: Use USB_ prefix instead of US_ prefix

[deliverable/linux.git] / drivers / usb / storage / scsiglue.c

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 4cc035562cc2e0669e588d4a376ad9bf1c25b032..e80362d148f31bcf5d8a32b343afea4cc56437a0 100644 (file)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -43,7 +43,6 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 
@@ -114,7 +113,7 @@ static int slave_alloc (struct scsi_device *sdev)
         * Let the scanning code know if this target merely sets
         * Peripheral Device Type to 0x1f to indicate no LUN.
         */
-       if (us->subclass == US_SC_UFI)
+       if (us->subclass == USB_SC_UFI)
                sdev->sdev_target->pdt_1f_for_no_lun = 1;
 
        return 0;
@@ -177,7 +176,7 @@ static int slave_configure(struct scsi_device *sdev)
                /* Disk-type devices use MODE SENSE(6) if the protocol
                 * (SubClass) is Transparent SCSI, otherwise they use
                 * MODE SENSE(10). */
-               if (us->subclass != US_SC_SCSI && us->subclass != US_SC_CYP_ATACB)
+               if (us->subclass != USB_SC_SCSI && us->subclass != USB_SC_CYP_ATACB)
                        sdev->use_10_for_ms = 1;
 
                /* Many disks only accept MODE SENSE transfer lengths of
@@ -246,7 +245,7 @@ static int slave_configure(struct scsi_device *sdev)
                 * capacity will be decremented or is correct. */
                if (!(us->fflags & (US_FL_FIX_CAPACITY | US_FL_CAPACITY_OK |
                                        US_FL_SCM_MULT_TARG)) &&
-                               us->protocol == US_PR_BULK)
+                               us->protocol == USB_PR_BULK)
                        us->use_last_sector_hacks = 1;
        } else {
 
@@ -262,7 +261,7 @@ static int slave_configure(struct scsi_device *sdev)
         * scsi_level == 0 (UNKNOWN).  Hence such devices must necessarily
         * be single-LUN.
         */
-       if ((us->protocol == US_PR_CB || us->protocol == US_PR_CBI) &&
+       if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_CBI) &&
                        sdev->scsi_level == SCSI_UNKNOWN)
                us->max_lun = 0;