* [PATCH v5] staging: rtl8192u: Remove ternary operator
@ 2017-02-27 5:27 Gargi Sharma
2017-02-27 6:28 ` [Outreachy kernel] " Julia Lawall
0 siblings, 1 reply; 2+ messages in thread
From: Gargi Sharma @ 2017-02-27 5:27 UTC (permalink / raw)
To: outreachy-kernel; +Cc: gregkh, Gargi Sharma
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>
---
Changes in v5:
- Removed if statement under comments.
Changes in v4:
- Aligned operands for && and added a newline.
Changes in v3:
- Converted ? operator to &&.
Changes in v2:
- Converted ? operator to if else statements.
---
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index c27397b..6072099 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);
//
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Outreachy kernel] [PATCH v5] staging: rtl8192u: Remove ternary operator
2017-02-27 5:27 [PATCH v5] staging: rtl8192u: Remove ternary operator Gargi Sharma
@ 2017-02-27 6:28 ` Julia Lawall
0 siblings, 0 replies; 2+ messages in thread
From: Julia Lawall @ 2017-02-27 6:28 UTC (permalink / raw)
To: Gargi Sharma; +Cc: outreachy-kernel, gregkh
On Mon, 27 Feb 2017, Gargi Sharma wrote:
> 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>
> ---
> Changes in v5:
> - Removed if statement under comments.
> Changes in v4:
> - Aligned operands for && and added a newline.
> Changes in v3:
> - Converted ? operator to &&.
> Changes in v2:
> - Converted ? operator to if else statements.
> ---
> drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
> index c27397b..6072099 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);
>
>
> //
> --
> 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/1488173270-12445-1-git-send-email-gs051095%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-27 6:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-27 5:27 [PATCH v5] staging: rtl8192u: Remove ternary operator Gargi Sharma
2017-02-27 6:28 ` [Outreachy kernel] " Julia Lawall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.