Commit 8036a7e7 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: UAS: use macro for reporting results



The SCSI layer has introduced a new macro for recording the result
of a command. Use it.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20200916094026.30085-3-oneukum@suse.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb2a86ae
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -279,17 +279,17 @@ static bool uas_evaluate_response_iu(struct response_iu *riu, struct scsi_cmnd *

	switch (response_code) {
	case RC_INCORRECT_LUN:
		cmnd->result = DID_BAD_TARGET << 16;
		set_host_byte(cmnd, DID_BAD_TARGET);
		break;
	case RC_TMF_SUCCEEDED:
		cmnd->result = DID_OK << 16;
		set_host_byte(cmnd, DID_OK);
		break;
	case RC_TMF_NOT_SUPPORTED:
		cmnd->result = DID_TARGET_FAILURE << 16;
		set_host_byte(cmnd, DID_TARGET_FAILURE);
		break;
	default:
		uas_log_cmd_state(cmnd, "response iu", response_code);
		cmnd->result = DID_ERROR << 16;
		set_host_byte(cmnd, DID_ERROR);
		break;
	}

@@ -660,7 +660,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
	spin_lock_irqsave(&devinfo->lock, flags);

	if (devinfo->resetting) {
		cmnd->result = DID_ERROR << 16;
		set_host_byte(cmnd, DID_ERROR);
		cmnd->scsi_done(cmnd);
		goto zombie;
	}
@@ -704,7 +704,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
	 * of queueing, no matter how fatal the error
	 */
	if (err == -ENODEV) {
		cmnd->result = DID_ERROR << 16;
		set_host_byte(cmnd, DID_ERROR);
		cmnd->scsi_done(cmnd);
		goto zombie;
	}