[PATCH] Staging: wilc1000: Remove unnecessary else after return

[PATCH] Staging: wilc1000: Remove unnecessary else after return

[Dilek Uzulmez]

This patch fixes checkpatch.pl warning in files of wilc1000
WARNING: else is not generally useful after a break or return

Signed-off-by: Dilek Uzulmez <dilekuzulmez@gmail.com>
---
 drivers/staging/wilc1000/coreconfigurator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 544c12d..b0cefe1 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -939,9 +939,9 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
 	    gpstrWlanOps->wlan_cfg_get == NULL)	{
 		PRINT_D(CORECONFIG_DBG, "Set and Get is still not initialized\n");
 		return 1;
-	} else {
-		PRINT_D(CORECONFIG_DBG, "SET is initialized\n");
 	}
+		PRINT_D(CORECONFIG_DBG, "SET is initialized\n");
+
 	if (u8Mode == GET_CFG) {
 		for (counter = 0; counter < u32WIDsCount; counter++) {
 			PRINT_INFO(CORECONFIG_DBG, "Sending CFG packet [%d][%d]\n", !counter,
-- 
1.9.1

Re: [Outreachy kernel] [PATCH] Staging: wilc1000: Remove unnecessary else after return

[Greg KH]

On Fri, Feb 19, 2016 at 03:18:25PM +0200, Dilek Uzulmez wrote:
> This patch fixes checkpatch.pl warning in files of wilc1000
> WARNING: else is not generally useful after a break or return
> 
> Signed-off-by: Dilek Uzulmez <dilekuzulmez@gmail.com>
> ---
>  drivers/staging/wilc1000/coreconfigurator.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
> index 544c12d..b0cefe1 100644
> --- a/drivers/staging/wilc1000/coreconfigurator.c
> +++ b/drivers/staging/wilc1000/coreconfigurator.c
> @@ -939,9 +939,9 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
>  	    gpstrWlanOps->wlan_cfg_get == NULL)	{
>  		PRINT_D(CORECONFIG_DBG, "Set and Get is still not initialized\n");
>  		return 1;
> -	} else {
> -		PRINT_D(CORECONFIG_DBG, "SET is initialized\n");
>  	}
> +		PRINT_D(CORECONFIG_DBG, "SET is initialized\n");
> +

Does that indentation look correct to you?  It doesn't to me...

thanks,

greg k-h

Re: [Outreachy kernel] [PATCH] Staging: wilc1000: Remove unnecessary else after return

[Julia Lawall]

On Fri, 19 Feb 2016, Dilek Uzulmez wrote:

> This patch fixes checkpatch.pl warning in files of wilc1000
> WARNING: else is not generally useful after a break or return
>
> Signed-off-by: Dilek Uzulmez <dilekuzulmez@gmail.com>
> ---
>  drivers/staging/wilc1000/coreconfigurator.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
> index 544c12d..b0cefe1 100644
> --- a/drivers/staging/wilc1000/coreconfigurator.c
> +++ b/drivers/staging/wilc1000/coreconfigurator.c
> @@ -939,9 +939,9 @@ s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
>  	    gpstrWlanOps->wlan_cfg_get == NULL)	{
>  		PRINT_D(CORECONFIG_DBG, "Set and Get is still not initialized\n");
>  		return 1;
> -	} else {
> -		PRINT_D(CORECONFIG_DBG, "SET is initialized\n");
>  	}
> +		PRINT_D(CORECONFIG_DBG, "SET is initialized\n");
> +

If you drop the else, the PRINT_D should be less indented.  Also there is
probably no need for a blank line.

julia


>  	if (u8Mode == GET_CFG) {
>  		for (counter = 0; counter < u32WIDsCount; counter++) {
>  			PRINT_INFO(CORECONFIG_DBG, "Sending CFG packet [%d][%d]\n", !counter,
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1455887905-7002-1-git-send-email-dilekuzulmez%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>