Commit 614065ab authored by Jinpeng Cui's avatar Jinpeng Cui Committed by Damien Le Moal
Browse files

ata: libata-core: remove redundant err_mask variable 



Return value from ata_exec_internal() directly instead of
taking this in another redundant variable.

Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarJinpeng Cui <cui.jinpeng2@zte.com.cn>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent fee60730

drivers/ata/libata-core.c

+1 −3
Original line number Diff line number Diff line
@@ -4340,7 +4340,6 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) 
unsigned int ata_dev_set_feature(struct ata_device *dev, u8 subcmd, u8 action)

{

	struct ata_taskfile tf;

	unsigned int err_mask;

	unsigned int timeout = 0;



	/* set up set-features taskfile */
@@ -4356,9 +4355,8 @@ unsigned int ata_dev_set_feature(struct ata_device *dev, u8 subcmd, u8 action) 
	if (subcmd == SETFEATURES_SPINUP)

		timeout = ata_probe_timeout ?

			  ata_probe_timeout * 1000 : SETFEATURES_SPINUP_TIMEOUT;

	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, timeout);



	return err_mask;

	return ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, timeout);

}

EXPORT_SYMBOL_GPL(ata_dev_set_feature);