Commit 360190bd authored by Niklas Cassel's avatar Niklas Cassel
Browse files

ata: libata-scsi: improve readability of ata_scsi_qc_issue() 



Improve readability of ata_scsi_qc_issue().

No functional changes.

Tested-by: default avatarTommy Kelly <linux@tkel.ly>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
parent 163f6494

drivers/ata/libata-scsi.c

+21 −22
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ static int ata_scsi_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc) 
	int ret;



	if (!ap->ops->qc_defer)

		goto issue;

		goto issue_qc;



	/*

	 * If we already have a deferred qc, then rely on the SCSI layer to
@@ -1786,17 +1786,21 @@ static int ata_scsi_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc) 
		break;

	case ATA_DEFER_LINK:

		ret = SCSI_MLQUEUE_DEVICE_BUSY;

		break;

		goto defer_qc;

	case ATA_DEFER_PORT:

		ret = SCSI_MLQUEUE_HOST_BUSY;

		break;

		goto defer_qc;

	default:

		WARN_ON_ONCE(1);

		ret = SCSI_MLQUEUE_HOST_BUSY;

		break;

		goto defer_qc;

	}



	if (ret) {

issue_qc:

	ata_qc_issue(qc);

	return 0;



defer_qc:

	/*

	 * We must defer this qc: if this is not an NCQ command, keep

	 * this qc as a deferred one and report to the SCSI layer that
@@ -1811,13 +1815,8 @@ static int ata_scsi_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc) 


	/* Force a requeue of the command to defer its execution. */

	ata_qc_free(qc);

		return ret;

	}



issue:

	ata_qc_issue(qc);



	return 0;

	return ret;

}



/**