diff options
| author | Gargi Sharma <gs051095@gmail.com> | 2017-02-27 10:57:50 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-06 09:17:07 +0100 |
| commit | eb1397d16fe7733321d99b5f331a49167478b952 (patch) | |
| tree | d9bd4fe17e2cb2de9725e7768c80c4ad77883843 /drivers/staging/rtl8192u | |
| parent | 483b10084d5d301089e6ad9e16a24cf501c5d253 (diff) | |
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>
Diffstat (limited to 'drivers/staging/rtl8192u')
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c index c27397b14adb..60720997784b 100644 --- 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); // |