linux-kernel - Re: [PATCH V3] Staging: rtl8712 removed unnecessary else after return

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141008224414.GA25262@kroah.com>
Date:	Wed, 8 Oct 2014 15:44:14 -0700
From:	Greg KH <gregkh@...uxfoundation.org>
To:	Nitin Kuppelur <nitinkuppelur@...il.com>
Cc:	devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH V3] Staging: rtl8712 removed unnecessary else after return

On Thu, Oct 02, 2014 at 02:32:26PM +0200, Nitin Kuppelur wrote:
> Removed unnecessary else after return to solve
> checkpatch.pl warning
> 
> Signed-off-by: Nitin Kuppelur <nitinkuppelur@...il.com>
> ---
>  drivers/staging/rtl8712/hal_init.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
> index 81cd654..fbaba11 100644
> --- a/drivers/staging/rtl8712/hal_init.c
> +++ b/drivers/staging/rtl8712/hal_init.c
> @@ -387,12 +387,9 @@ uint rtl8712_hal_deinit(struct _adapter *padapter)
>  uint rtl871x_hal_init(struct _adapter *padapter)
>  {
>  	padapter->hw_init_completed = false;
> -	if (padapter->halpriv.hal_bus_init == NULL)
> +	if (padapter->halpriv.hal_bus_init == NULL ||
> +	    padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
>  		return _FAIL;
> -	else {
> -		if (padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
> -			return _FAIL;
> -	}
>  	if (rtl8712_hal_init(padapter) == _SUCCESS)
>  		padapter->hw_init_completed = true;
>  	else {

This doesn't apply to my tree :(
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/