Re: [Outreachy kernel] [PATCH] Staging: rtl8192u: Reposition of return statements

[Jes Sorensen <jes.sorensen@gmail.com>]

On 02/19/15 17:38, Ksenija Stanojevic wrote:
> This patch fixes the checkpatch.pl warning:
> WARNING: "else is not generally useful after a break or return"
> by placing return reg after if-else branch.
> 
> Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
> ---
>  drivers/staging/rtl8192u/r819xU_phy.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
> index d006602..f343735 100644
> --- a/drivers/staging/rtl8192u/r819xU_phy.c
> +++ b/drivers/staging/rtl8192u/r819xU_phy.c
> @@ -355,13 +355,12 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
>  		bitshift =  rtl8192_CalculateBitShift(bitmask);
>  		reg = (reg & bitmask) >> bitshift;
>  		udelay(200);
> -		return reg;
>  	} else {
>  		reg = rtl8192_phy_RFSerialRead(dev, eRFPath, reg_addr);
>  		bitshift =  rtl8192_CalculateBitShift(bitmask);
>  		reg = (reg & bitmask) >> bitshift;
> -		return reg;
>  	}
> +	return reg;
>  }
>  
>  /******************************************************************************
> 

In this case the automated commit message is actually a little unclear,
at least to me. Explaining that you are simplifying the code by not
having two identical paths would be better.

You could take this patch further as most of the code is identical
except for the udelay() in the first case.

Cheers,
Jes