Re: [PATCH linux-next] ata: libata-core: remove redundant err_mask variable

From: Damien Le Moal
Date: Thu Aug 25 2022 - 18:47:57 EST


On 8/23/22 21:29, cgel.zte@xxxxxxxxx wrote:
> From: Jinpeng Cui <cui.jinpeng2@xxxxxxxxxx>
>
> Return value from ata_exec_internal() directly instead of
> taking this in another redundant variable.
>
> Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
> Signed-off-by: Jinpeng Cui <cui.jinpeng2@xxxxxxxxxx>

Applied to for-6.1. Thanks !

> ---
> drivers/ata/libata-core.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 864b26009eae..0ba0e692210f 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -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);
>


--
Damien Le Moal
Western Digital Research