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

Commit af74d2da authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

usb-storage: reorganize target-specific code 



Now that usb-storage has a target_alloc() routine, this patch (as1508)
moves some existing target-specific code out of the slave_alloc()
routine to where it really belongs.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09b6b51b

drivers/usb/storage/scsiglue.c

+15 −14
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ static const char* host_info(struct Scsi_Host *host) 


static int slave_alloc (struct scsi_device *sdev)

{

	struct us_data *us = host_to_us(sdev->host);



	/*

	 * Set the INQUIRY transfer length to 36.  We don't use any of

	 * the extra data and many devices choke if asked for more or
@@ -104,18 +102,6 @@ static int slave_alloc (struct scsi_device *sdev) 
	 */

	blk_queue_update_dma_alignment(sdev->request_queue, (512 - 1));



	/*

	 * The UFI spec treates the Peripheral Qualifier bits in an

	 * INQUIRY result as reserved and requires devices to set them

	 * to 0.  However the SCSI spec requires these bits to be set

	 * to 3 to indicate when a LUN is not present.

	 *

	 * Let the scanning code know if this target merely sets

	 * Peripheral Device Type to 0x1f to indicate no LUN.

	 */

	if (us->subclass == USB_SC_UFI)

		sdev->sdev_target->pdt_1f_for_no_lun = 1;



	return 0;

}
@@ -278,6 +264,8 @@ static int slave_configure(struct scsi_device *sdev) 


static int target_alloc(struct scsi_target *starget)

{

	struct us_data *us = host_to_us(dev_to_shost(starget->dev.parent));



	/*

	 * Some USB drives don't support REPORT LUNS, even though they

	 * report a SCSI revision level above 2.  Tell the SCSI layer
@@ -285,6 +273,19 @@ static int target_alloc(struct scsi_target *starget) 
	 * scan instead.

	 */

	starget->no_report_luns = 1;



	/*

	 * The UFI spec treats the Peripheral Qualifier bits in an

	 * INQUIRY result as reserved and requires devices to set them

	 * to 0.  However the SCSI spec requires these bits to be set

	 * to 3 to indicate when a LUN is not present.

	 *

	 * Let the scanning code know if this target merely sets

	 * Peripheral Device Type to 0x1f to indicate no LUN.

	 */

	if (us->subclass == USB_SC_UFI)

		starget->pdt_1f_for_no_lun = 1;



	return 0;

}