Commit 84eac327 authored by Wenchao Hao's avatar Wenchao Hao Committed by Damien Le Moal
Browse files

ata: libata-scsi: simplify __ata_scsi_queuecmd() 



This patch cleans up the code of __ata_scsi_queuecmd(). Since each
branch of the "if" condition check that scmd->cmd_len is not zero, move
this check out of the "if" to simplify the conditions being checked in
the "else" branch.

While at it, avoid the if-else-if-else structure using if-else if
structure and remove the redundant rc local variable.

This patch does not change the function logic.

Signed-off-by: default avatarWenchao Hao <haowenchao@huawei.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent db6a3f47

drivers/ata/libata-scsi.c

+21 −24
Original line number Diff line number Diff line
@@ -3958,21 +3958,19 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev) 
{

	u8 scsi_op = scmd->cmnd[0];

	ata_xlat_func_t xlat_func;

	int rc = 0;



	if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {

		if (unlikely(!scmd->cmd_len || scmd->cmd_len > dev->cdb_len))

	if (unlikely(!scmd->cmd_len))

		goto bad_cdb_len;



		xlat_func = ata_get_xlat_func(dev, scsi_op);

	} else {

		if (unlikely(!scmd->cmd_len))

	if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {

		if (unlikely(scmd->cmd_len > dev->cdb_len))

			goto bad_cdb_len;



		xlat_func = NULL;

		if (likely((scsi_op != ATA_16) || !atapi_passthru16)) {

		xlat_func = ata_get_xlat_func(dev, scsi_op);

	} else if (likely((scsi_op != ATA_16) || !atapi_passthru16)) {

		/* relay SCSI command to ATAPI device */

		int len = COMMAND_SIZE(scsi_op);



		if (unlikely(len > scmd->cmd_len ||

			     len > dev->cdb_len ||

			     scmd->cmd_len > ATAPI_CDB_LEN))
@@ -3986,14 +3984,13 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev) 


		xlat_func = ata_get_xlat_func(dev, scsi_op);

	}

	}



	if (xlat_func)

		rc = ata_scsi_translate(dev, scmd, xlat_func);

	else

		return ata_scsi_translate(dev, scmd, xlat_func);



	ata_scsi_simulate(dev, scmd);



	return rc;

	return 0;



 bad_cdb_len:

	scmd->result = DID_ERROR << 16;