Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa7fd74 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichal Nazarewicz <mina86@mina86.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1992de83

drivers/block/ub.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum); 
#else



static const struct usb_device_id ub_usb_ids[] = {

	{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_SCSI, US_PR_BULK) },

	{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, USB_SC_SCSI, USB_PR_BULK) },

	{ }

};

drivers/usb/storage/scsiglue.c

+4 −4
Original line number Diff line number Diff line
@@ -113,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;
@@ -176,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
@@ -245,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 {
@@ -261,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;

drivers/usb/storage/sddr09.c

+1 −1
Original line number Diff line number Diff line
@@ -1760,7 +1760,7 @@ static int sddr09_probe(struct usb_interface *intf, 
	if (result)

		return result;



	if (us->protocol == US_PR_DPCM_USB) {

	if (us->protocol == USB_PR_DPCM_USB) {

		us->transport_name = "Control/Bulk-EUSB/SDDR09";

		us->transport = dpcm_transport;

		us->transport_reset = usb_stor_CB_reset;

drivers/usb/storage/transport.c

+5 −5
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) 
	 * unless the operation involved a data-in transfer.  Devices

	 * can signal most data-in errors by stalling the bulk-in pipe.

	 */

	if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) &&

	if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_DPCM_USB) &&

			srb->sc_data_direction != DMA_FROM_DEVICE) {

		US_DEBUGP("-- CB transport device requiring auto-sense\n");

		need_auto_sense = 1;
@@ -701,8 +701,8 @@ Retry_Sense: 
		scsi_eh_prep_cmnd(srb, &ses, NULL, 0, sense_size);



		/* FIXME: we must do the protocol translation here */

		if (us->subclass == US_SC_RBC || us->subclass == US_SC_SCSI ||

				us->subclass == US_SC_CYP_ATACB)

		if (us->subclass == USB_SC_RBC || us->subclass == USB_SC_SCSI ||

				us->subclass == USB_SC_CYP_ATACB)

			srb->cmd_len = 6;

		else

			srb->cmd_len = 12;
@@ -926,7 +926,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us) 
	/* NOTE: CB does not have a status stage.  Silly, I know.  So

	 * we have to catch this at a higher level.

	 */

	if (us->protocol != US_PR_CBI)

	if (us->protocol != USB_PR_CBI)

		return USB_STOR_TRANSPORT_GOOD;



	result = usb_stor_intr_transfer(us, us->iobuf, 2);
@@ -942,7 +942,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us) 
	 * that this means we could be ignoring a real error on these

	 * commands, but that can't be helped.

	 */

	if (us->subclass == US_SC_UFI) {

	if (us->subclass == USB_SC_UFI) {

		if (srb->cmnd[0] == REQUEST_SENSE ||

		    srb->cmnd[0] == INQUIRY)

			return USB_STOR_TRANSPORT_GOOD;

drivers/usb/storage/unusual_alauda.h

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
UNUSUAL_DEV(  0x0584, 0x0008, 0x0102, 0x0102,

		"Fujifilm",

		"DPC-R1 (Alauda)",

		US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0),

		USB_SC_SCSI, USB_PR_ALAUDA, init_alauda, 0),



UNUSUAL_DEV(  0x07b4, 0x010a, 0x0102, 0x0102,

		"Olympus",

		"MAUSB-10 (Alauda)",

		US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0),

		USB_SC_SCSI, USB_PR_ALAUDA, init_alauda, 0),



#endif /* defined(CONFIG_USB_STORAGE_ALAUDA) || ... */