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

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

USB: ene_usb6250: remove subroutine duplication 



In the ene_usb6250 sub-driver for usb-storage, the sd_scsi_inquiry()
and ms_scsi_inquiry() subroutines (one meant for use with SD memory
cards and the other for use with MS memory cards) are exact
duplicates.  This patch removes the duplication by creating a single
do_scsi_inquiry() command and using it instead of the other two.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarAndreas Hartmann <andihartmann@01019freenet.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce553bd1

drivers/usb/storage/ene_ub6250.c

+14 −27
Original line number Diff line number Diff line
@@ -593,6 +593,18 @@ static int do_scsi_request_sense(struct us_data *us, struct scsi_cmnd *srb) 
	return USB_STOR_TRANSPORT_GOOD;

}



static int do_scsi_inquiry(struct us_data *us, struct scsi_cmnd *srb)

{

	unsigned char data_ptr[36] = {

		0x00, 0x80, 0x02, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x55,

		0x53, 0x42, 0x32, 0x2E, 0x30, 0x20, 0x20, 0x43, 0x61,

		0x72, 0x64, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20,

		0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x30, 0x30 };



	usb_stor_set_xfer_buf(data_ptr, 36, srb);

	return USB_STOR_TRANSPORT_GOOD;

}



static int sd_scsi_test_unit_ready(struct us_data *us, struct scsi_cmnd *srb)

{

	struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;
@@ -607,18 +619,6 @@ static int sd_scsi_test_unit_ready(struct us_data *us, struct scsi_cmnd *srb) 
	return USB_STOR_TRANSPORT_GOOD;

}



static int sd_scsi_inquiry(struct us_data *us, struct scsi_cmnd *srb)

{

	unsigned char data_ptr[36] = {

		0x00, 0x80, 0x02, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x55,

		0x53, 0x42, 0x32, 0x2E, 0x30, 0x20, 0x20, 0x43, 0x61,

		0x72, 0x64, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20,

		0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x30, 0x30 };



	usb_stor_set_xfer_buf(data_ptr, 36, srb);

	return USB_STOR_TRANSPORT_GOOD;

}



static int sd_scsi_mode_sense(struct us_data *us, struct scsi_cmnd *srb)

{

	struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;
@@ -1462,19 +1462,6 @@ static int ms_scsi_test_unit_ready(struct us_data *us, struct scsi_cmnd *srb) 
	return USB_STOR_TRANSPORT_GOOD;

}



static int ms_scsi_inquiry(struct us_data *us, struct scsi_cmnd *srb)

{

	/* pr_info("MS_SCSI_Inquiry\n"); */

	unsigned char data_ptr[36] = {

		0x00, 0x80, 0x02, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x55,

		0x53, 0x42, 0x32, 0x2E, 0x30, 0x20, 0x20, 0x43, 0x61,

		0x72, 0x64, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20,

		0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x30, 0x30};



	usb_stor_set_xfer_buf(data_ptr, 36, srb);

	return USB_STOR_TRANSPORT_GOOD;

}



static int ms_scsi_mode_sense(struct us_data *us, struct scsi_cmnd *srb)

{

	struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;
@@ -2236,7 +2223,7 @@ static int sd_scsi_irp(struct us_data *us, struct scsi_cmnd *srb) 
		result = do_scsi_request_sense(us, srb);

		break; /* 0x03 */

	case INQUIRY:

		result = sd_scsi_inquiry(us, srb);

		result = do_scsi_inquiry(us, srb);

		break; /* 0x12 */

	case MODE_SENSE:

		result = sd_scsi_mode_sense(us, srb);
@@ -2281,7 +2268,7 @@ static int ms_scsi_irp(struct us_data *us, struct scsi_cmnd *srb) 
		result = do_scsi_request_sense(us, srb);

		break; /* 0x03 */

	case INQUIRY:

		result = ms_scsi_inquiry(us, srb);

		result = do_scsi_inquiry(us, srb);

		break; /* 0x12 */

	case MODE_SENSE:

		result = ms_scsi_mode_sense(us, srb);