Commit 8959e81c authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: stex: Do not set COMMAND_COMPLETE 

COMMAND_COMPLETE is defined as '0', so setting it is quite pointless.

Link: https://lore.kernel.org/r/20210113090500.129644-18-hare@suse.de


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0e310ac4

drivers/scsi/stex.c

+13 −12
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) 
		if (page == 0x8 || page == 0x3f) {

			scsi_sg_copy_from_buffer(cmd, ms10_caching_page,

						 sizeof(ms10_caching_page));

			cmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;

			cmd->result = DID_OK << 16;

			done(cmd);

		} else

			stex_invalid_field(cmd, done);
@@ -644,7 +644,7 @@ stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) 
		break;

	case TEST_UNIT_READY:

		if (id == host->max_id - 1) {

			cmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;

			cmd->result = DID_OK << 16;

			done(cmd);

			return 0;

		}
@@ -661,7 +661,7 @@ stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) 
			(cmd->cmnd[1] & INQUIRY_EVPD) == 0) {

			scsi_sg_copy_from_buffer(cmd, (void *)console_inq_page,

						 sizeof(console_inq_page));

			cmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;

			cmd->result = DID_OK << 16;

			done(cmd);

		} else

			stex_invalid_field(cmd, done);
@@ -679,9 +679,10 @@ stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) 
			ver.console_id = host->max_id - 1;

			ver.host_no = hba->host->host_no;

			cp_len = scsi_sg_copy_from_buffer(cmd, &ver, cp_len);

			cmd->result = sizeof(ver) == cp_len ?

				DID_OK << 16 | COMMAND_COMPLETE << 8 :

				DID_ERROR << 16 | COMMAND_COMPLETE << 8;

			if (sizeof(ver) == cp_len)

				cmd->result = DID_OK << 16;

			else

				cmd->result = DID_ERROR << 16;

			done(cmd);

			return 0;

		}
@@ -736,16 +737,16 @@ static void stex_scsi_done(struct st_ccb *ccb) 
		result = ccb->scsi_status;

		switch (ccb->scsi_status) {

		case SAM_STAT_GOOD:

			result |= DID_OK << 16 | COMMAND_COMPLETE << 8;

			result |= DID_OK << 16;

			break;

		case SAM_STAT_CHECK_CONDITION:

			result |= DRIVER_SENSE << 24;

			break;

		case SAM_STAT_BUSY:

			result |= DID_BUS_BUSY << 16 | COMMAND_COMPLETE << 8;

			result |= DID_BUS_BUSY << 16;

			break;

		default:

			result |= DID_ERROR << 16 | COMMAND_COMPLETE << 8;

			result |= DID_ERROR << 16;

			break;

		}

	}
@@ -753,15 +754,15 @@ static void stex_scsi_done(struct st_ccb *ccb) 
		result = DRIVER_SENSE << 24 | SAM_STAT_CHECK_CONDITION;

	else switch (ccb->srb_status) {

		case SRB_STATUS_SELECTION_TIMEOUT:

			result = DID_NO_CONNECT << 16 | COMMAND_COMPLETE << 8;

			result = DID_NO_CONNECT << 16;

			break;

		case SRB_STATUS_BUSY:

			result = DID_BUS_BUSY << 16 | COMMAND_COMPLETE << 8;

			result = DID_BUS_BUSY << 16;

			break;

		case SRB_STATUS_INVALID_REQUEST:

		case SRB_STATUS_ERROR:

		default:

			result = DID_ERROR << 16 | COMMAND_COMPLETE << 8;

			result = DID_ERROR << 16;

			break;

	}