Re: [PATCH 25/36] platform/x86: toshiba_haps: remove conditional return with no effect

[Ilpo Järvinen]

On Fri, 24 Jul 2026, Sang-Heon Jeon wrote:

> Both branches of the check return the same value, so the check has
> no effect. Remove it and return the value directly.
> 
> This is the result of running the Coccinelle script from
> scripts/coccinelle/misc/cond_return_no_effect.cocci.
> 
> Signed-off-by: Sang-Heon Jeon <ekffu200098@xxxxxxxxx>
> ---
>  drivers/platform/x86/toshiba_haps.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/platform/x86/toshiba_haps.c b/drivers/platform/x86/toshiba_haps.c
> index c6633b74029f..4f62476b8dd1 100644
> --- a/drivers/platform/x86/toshiba_haps.c
> +++ b/drivers/platform/x86/toshiba_haps.c
> @@ -251,11 +251,7 @@ static int toshiba_haps_resume(struct device *device)
>  					    haps->protection_level);
>  
>  	/* Reset the protection on resume */
> -	ret = toshiba_haps_reset_protection(haps->acpi_dev->handle);
> -	if (ret != 0)
> -		return ret;
> -
> -	return ret;
> +	return toshiba_haps_reset_protection(haps->acpi_dev->handle);
>  }
>  #endif

Sadly this has not seen much testing:

  CC      drivers/platform/x86/toshiba_haps.o
drivers/platform/x86/toshiba_haps.c: In function ʽtoshiba_haps_resumeʼ:
drivers/platform/x86/toshiba_haps.c:247:13: error: variable ʽretʼ set but not used [-Werror=unused-but-set-variable]
  247 |         int ret;
      |             ^~~
cc1: all warnings being treated as errors
make[5]: *** [scripts/Makefile.build:289: 
drivers/platform/x86/toshiba_haps.o] Error 1

...I guess you never took the time to look at and understand the 
surrounding code either. :-(

-- 
 i.