staging: rtl8192u: Remove ternary operator

Relational and logical operators evaluate to either true or false.
Lines with ternary operators were found using coccinelle script. In a
few cases using logical && operator would suffice. Hence those were
changed 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>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index c27397b14adb86874aa745ec1dc3bf027f76e173..60720997784b597f2a7af0e0eb7109d0d8942248 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -976,17 +976,16 @@ 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);
+       pHTInfo->bCurTxBW40MHz = (pPeerHTInfo->RecommemdedTxWidth == 1);
 
        //
        // 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);
+       pHTInfo->bCurShortGI20MHz = pHTInfo->bRegShortGI20MHz &&
+                                   (pPeerHTCap->ShortGI20Mhz == 1);
+       pHTInfo->bCurShortGI40MHz = pHTInfo->bRegShortGI40MHz &&
+                                  (pPeerHTCap->ShortGI40Mhz == 1);
 
        //
        // Config TX STBC setting
@@ -997,8 +996,8 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
        // Config DSSS/CCK  mode in 40MHz mode
        //
        // TODO:
-       pHTInfo->bCurSuppCCK =
-               ((pHTInfo->bRegSuppCCK)?((pPeerHTCap->DssCCk==1)?true:false):false);
+       pHTInfo->bCurSuppCCK = pHTInfo->bRegSuppCCK &&
+                              (pPeerHTCap->DssCCk == 1);
 
 
        //