[PATCH v2] staging: rtl8192u: Remove ternary operator

[PATCH v2] staging: rtl8192u: Remove ternary operator

[Gargi Sharma]

Relational and logical operators evaluate to either true or false.
Lines with ternary operators were found using coccinelle script and
conversion to if else statements was done manually to improve
readability.

Coccinelle Script:
@r@
expression A,B;
symbol true,false;
binary operator b = {==,!=,&&,||,>=,<=,>,<};
@@
- (A b B) ? true : false
+ A b B

Signed-off-by: Gargi Sharma <gs051095@gmail.com>
---
Changes in v2:
        - Converted ? operator to if else statements.
---
 .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c    | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index c27397b..cc4394e 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -977,16 +977,24 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
 	HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
 
 //	if (pHTInfo->bCurBW40MHz)
-		pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false);
+	if (pPeerHTInfo->RecommemdedTxWidth == 1)
+		pHTInfo->bCurTxBW40MHz = true;
+	else
+		pHTInfo->bCurTxBW40MHz = false;
 
 	//
 	// Update short GI/ long GI setting
 	//
 	// TODO:
-	pHTInfo->bCurShortGI20MHz=
-		((pHTInfo->bRegShortGI20MHz)?((pPeerHTCap->ShortGI20Mhz==1)?true:false):false);
-	pHTInfo->bCurShortGI40MHz=
-		((pHTInfo->bRegShortGI40MHz)?((pPeerHTCap->ShortGI40Mhz==1)?true:false):false);
+	if (pHTInfo->bRegShortGI20MHz == 1)
+		pHTInfo->bCurShortGI20MHz = (pPeerHTCap->ShortGI20Mhz == 1);
+	else
+		pHTInfo->bCurShortGI20MHz = false;
+
+	if (pHTInfo->bRegShortGI40MHz == 1)
+		pHTInfo->bCurShortGI40MHz = (pPeerHTCap->ShortGI40Mhz == 1);
+	else
+		pHTInfo->bCurShortGI40MHz = false;
 
 	//
 	// Config TX STBC setting
@@ -997,9 +1005,11 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
 	// Config DSSS/CCK  mode in 40MHz mode
 	//
 	// TODO:
-	pHTInfo->bCurSuppCCK =
-		((pHTInfo->bRegSuppCCK)?((pPeerHTCap->DssCCk==1)?true:false):false);
 
+	if (pHTInfo->bRegSuppCCK == 1)
+		pHTInfo->bCurSuppCCK = (pPeerHTCap->DssCCk == 1);
+	else
+		pHTInfo->bCurSuppCCK = false;
 
 	//
 	// Config and configure A-MSDU setting
-- 
2.7.4

Re: [Outreachy kernel] [PATCH v2] staging: rtl8192u: Remove ternary operator

[Julia Lawall]

On Mon, 20 Feb 2017, Gargi Sharma wrote:

> Relational and logical operators evaluate to either true or false.
> Lines with ternary operators were found using coccinelle script and
> conversion to if else statements was done manually to improve
> readability.
>
> Coccinelle Script:
> @r@
> expression A,B;
> symbol true,false;
> binary operator b = {==,!=,&&,||,>=,<=,>,<};
> @@
> - (A b B) ? true : false
> + A b B
>
> Signed-off-by: Gargi Sharma <gs051095@gmail.com>
> ---
> Changes in v2:
>         - Converted ? operator to if else statements.
> ---
>  .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c    | 24 +++++++++++++++-------
>  1 file changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
> index c27397b..cc4394e 100644
> --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
> +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
> @@ -977,16 +977,24 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
>  	HTSetConnectBwMode(ieee, (HT_CHANNEL_WIDTH)(pPeerHTCap->ChlWidth), (HT_EXTCHNL_OFFSET)(pPeerHTInfo->ExtChlOffset));
>
>  //	if (pHTInfo->bCurBW40MHz)
> -		pHTInfo->bCurTxBW40MHz = ((pPeerHTInfo->RecommemdedTxWidth == 1)?true:false);
> +	if (pPeerHTInfo->RecommemdedTxWidth == 1)
> +		pHTInfo->bCurTxBW40MHz = true;
> +	else
> +		pHTInfo->bCurTxBW40MHz = false;

Sorry, I wasn't suggesting tochange this one to an if.  You were already
able to completely get rid of the ?

>
>  	//
>  	// Update short GI/ long GI setting
>  	//
>  	// TODO:
> -	pHTInfo->bCurShortGI20MHz=
> -		((pHTInfo->bRegShortGI20MHz)?((pPeerHTCap->ShortGI20Mhz==1)?true:false):false);
> -	pHTInfo->bCurShortGI40MHz=
> -		((pHTInfo->bRegShortGI40MHz)?((pPeerHTCap->ShortGI40Mhz==1)?true:false):false);
> +	if (pHTInfo->bRegShortGI20MHz == 1)
> +		pHTInfo->bCurShortGI20MHz = (pPeerHTCap->ShortGI20Mhz == 1);
> +	else
> +		pHTInfo->bCurShortGI20MHz = false;
> +
> +	if (pHTInfo->bRegShortGI40MHz == 1)
> +		pHTInfo->bCurShortGI40MHz = (pPeerHTCap->ShortGI40Mhz == 1);
> +	else
> +		pHTInfo->bCurShortGI40MHz = false;

Now that the code is more readable, it seems that actually the if is not
needed, and you can use &&.  The same for the next one.

julia

>  	//
>  	// Config TX STBC setting
> @@ -997,9 +1005,11 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
>  	// Config DSSS/CCK  mode in 40MHz mode
>  	//
>  	// TODO:
> -	pHTInfo->bCurSuppCCK =
> -		((pHTInfo->bRegSuppCCK)?((pPeerHTCap->DssCCk==1)?true:false):false);
>
> +	if (pHTInfo->bRegSuppCCK == 1)
> +		pHTInfo->bCurSuppCCK = (pPeerHTCap->DssCCk == 1);
> +	else
> +		pHTInfo->bCurSuppCCK = false;
>
>  	//
>  	// Config and configure A-MSDU setting
> --
> 2.7.4
>
> --
> 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/1487535589-22437-1-git-send-email-gs051095%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>