Re: [Outreachy kernel] [PATCH 1/4] Staging: vt6655: Limit return statements.

[Stefano Brivio <sbrivio@redhat.com>]

On Sun, 29 Mar 2020 21:47:59 -0700
Briana Oursler <briana.oursler@gmail.com> wrote:

> Limit return statements within context of switch case to improve
> readability.
> 
> Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
> ---
>  drivers/staging/vt6655/rxtx.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> index 37fcc42ed000..f9e2087d2242 100644
> --- a/drivers/staging/vt6655/rxtx.c
> +++ b/drivers/staging/vt6655/rxtx.c
> @@ -261,10 +261,11 @@ s_uGetDataDuration(
>  
>  			if (bNeedAck) {
>  				uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
> -				return pDevice->uSIFS + uAckTime + uNextPktTime;
>  			} else {
> -				return pDevice->uSIFS + uNextPktTime;
> +				uAckTime = 0;

There's no need anymore to set this to zero (it's initialised already),
hence the else clauses can go away, and also the curly brackets. I
consider these as related changes, others might see it differently (but
I guess here it's a relatively safe assumption).

>  			}
> +
> +			return pDevice->uSIFS + uAckTime + uNextPktTime;
>  		}
>  		break;
>  
> @@ -284,10 +285,11 @@ s_uGetDataDuration(
>  
>  			if (bNeedAck) {
>  				uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
> -				return pDevice->uSIFS + uAckTime + uNextPktTime;
>  			} else {
> -				return pDevice->uSIFS + uNextPktTime;
> +				uAckTime = 0;
>  			}
> +
> +			return pDevice->uSIFS + uAckTime + uNextPktTime;
>  		}
>  		break;
>  
> @@ -325,10 +327,10 @@ s_uGetDataDuration(
>  
>  			if (bNeedAck) {
>  				uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
> -				return pDevice->uSIFS + uAckTime + uNextPktTime;
>  			} else {
> -				return pDevice->uSIFS + uNextPktTime;
> +				uAckTime = 0;
>  			}
> +			return pDevice->uSIFS + uAckTime + uNextPktTime;
>  		}
>  		break;
>  
> @@ -365,10 +367,10 @@ s_uGetDataDuration(
>  			}
>  			if (bNeedAck) {
>  				uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
> -				return pDevice->uSIFS + uAckTime + uNextPktTime;
>  			} else {
> -				return pDevice->uSIFS + uNextPktTime;
> +				uAckTime = 0;
>  			}
> +			return pDevice->uSIFS + uAckTime + uNextPktTime;
>  		}
>  		break;
>