ata: libata-eh: Remove the unneeded result variable

[PATCH linux-next] ata: libata-eh: Remove the unneeded result variable

Posted by cgel.zte@gmail.com 3 years, 6 months ago

From: ye xingchen <ye.xingchen@zte.com.cn>

Return the value ata_port_abort() directly instead of storing it in
another redundant variable.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
---
 drivers/ata/libata-eh.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 7c128c89b454..7dbca2a2f9ee 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1086,14 +1086,11 @@ static void __ata_port_freeze(struct ata_port *ap)
  */
 int ata_port_freeze(struct ata_port *ap)
 {
-	int nr_aborted;
-
 	WARN_ON(!ap->ops->error_handler);
 
 	__ata_port_freeze(ap);
-	nr_aborted = ata_port_abort(ap);
 
-	return nr_aborted;
+	return ata_port_abort(ap);
 }
 EXPORT_SYMBOL_GPL(ata_port_freeze);
 
-- 
2.25.1

Re: [PATCH linux-next] ata: libata-eh: Remove the unneeded result variable

Posted by Damien Le Moal 3 years, 6 months ago

On 9/20/22 15:29, cgel.zte@gmail.com wrote:
> From: ye xingchen <ye.xingchen@zte.com.cn>
> 
> Return the value ata_port_abort() directly instead of storing it in
> another redundant variable.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>

Applied to for-6.1. Thanks !

> ---
>   drivers/ata/libata-eh.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
> index 7c128c89b454..7dbca2a2f9ee 100644
> --- a/drivers/ata/libata-eh.c
> +++ b/drivers/ata/libata-eh.c
> @@ -1086,14 +1086,11 @@ static void __ata_port_freeze(struct ata_port *ap)
>    */
>   int ata_port_freeze(struct ata_port *ap)
>   {
> -	int nr_aborted;
> -
>   	WARN_ON(!ap->ops->error_handler);
>   
>   	__ata_port_freeze(ap);
> -	nr_aborted = ata_port_abort(ap);
>   
> -	return nr_aborted;
> +	return ata_port_abort(ap);
>   }
>   EXPORT_SYMBOL_GPL(ata_port_freeze);
>   

-- 
Damien Le Moal
Western Digital Research