Re: [PATCH] staging: rtl8192e: fix bool comparison in expressions
From: Kari Argillander
Date: Sun Dec 20 2020 - 11:00:05 EST
On Thu, Dec 17, 2020 at 05:12:04PM +0530, Aditya Srivastava wrote:
> There are certain conditional expressions in rtl8192e, where a boolean
> variable is compared with true/false, in forms such as (foo == true) or
> (false != bar), which does not comply with checkpatch.pl (CHECK:
> BOOL_COMPARISON), according to which boolean variables should be
> themselves used in the condition, rather than comparing with true/false
>
> E.g. in drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c,
> "if (Type == true)" can be replaced with: "if (Type)"
>
> Replace all such expressions with the bool variables appropriately
>
> Signed-off-by: Aditya Srivastava <yashsri421@xxxxxxxxx>
> ---
> - the changes made are compile tested
> - the patch applies perfectly over next-20201204
>
> drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++--
> drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++--
> drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 ++--
> drivers/staging/rtl8192e/rtllib_rx.c | 4 ++--
> drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> 5 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
> index 9f869fb3eaa8..c4a3fc79fb40 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
> @@ -129,9 +129,9 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
> RegRCR = rtl92e_readl(dev, RCR);
> priv->ReceiveConfig = RegRCR;
>
> - if (Type == true)
> + if (Type)
> RegRCR |= (RCR_CBSSID);
> - else if (Type == false)
> + else if (!Type)
Just else here?
> RegRCR &= (~RCR_CBSSID);
>
> rtl92e_writel(dev, RCR, RegRCR);
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> index 663675efcfe4..9078fadd65f9 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> @@ -1389,7 +1389,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)
>
> rtl92e_dm_watchdog(dev);
>
> - if (rtllib_act_scanning(priv->rtllib, false) == false) {
> + if (!rtllib_act_scanning(priv->rtllib, false)) {
> if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state ==
> RTLLIB_NOLINK) &&
> (ieee->eRFPowerState == eRfOn) && !ieee->is_set_key &&
> @@ -2471,7 +2471,7 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev,
>
> priv->ops = ops;
>
> - if (rtl92e_check_adapter(pdev, dev) == false)
> + if (!rtl92e_check_adapter(pdev, dev))
> goto err_unmap;
>
> dev->irq = pdev->irq;
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> index 462835684e8b..e340be3ebb97 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> @@ -1765,7 +1765,7 @@ static void _rtl92e_dm_cts_to_self(struct net_device *dev)
> unsigned long curTxOkCnt = 0;
> unsigned long curRxOkCnt = 0;
>
> - if (priv->rtllib->bCTSToSelfEnable != true) {
> + if (!priv->rtllib->bCTSToSelfEnable) {
> pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
> return;
> }
> @@ -2447,7 +2447,7 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev)
> unsigned int txhipower_threshold = 0;
> unsigned int txlowpower_threshold = 0;
>
> - if (priv->rtllib->bdynamic_txpower_enable != true) {
> + if (!priv->rtllib->bdynamic_txpower_enable) {
> priv->bDynamicTxHighPower = false;
> priv->bDynamicTxLowPower = false;
> return;
> diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
> index d31b5e1c8df4..217557ac8d80 100644
> --- a/drivers/staging/rtl8192e/rtllib_rx.c
> +++ b/drivers/staging/rtl8192e/rtllib_rx.c
> @@ -924,7 +924,7 @@ static int rtllib_rx_check_duplicate(struct rtllib_device *ieee,
> sc = le16_to_cpu(hdr->seq_ctl);
> frag = WLAN_GET_SEQ_FRAG(sc);
>
> - if ((ieee->pHTInfo->bCurRxReorderEnable == false) ||
> + if ((!ieee->pHTInfo->bCurRxReorderEnable) ||
No need for brackets. Atleast after you remove check.
> !ieee->current_network.qos_data.active ||
> !IsDataFrame(skb->data) ||
> IsLegacyDataFrame(skb->data)) {
> @@ -1442,7 +1442,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
> }
>
> /* Indicate packets to upper layer or Rx Reorder */
> - if (ieee->pHTInfo->bCurRxReorderEnable == false || pTS == NULL ||
> + if (!ieee->pHTInfo->bCurRxReorderEnable || pTS == NULL ||
> bToOtherSTA)
Now bToOtherSTA would fit same line. It is ok to fix that also.
> rtllib_rx_indicate_pkt_legacy(ieee, rx_stats, rxb, dst, src);
> else
> diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
> index e0d79daca24a..8add17752eed 100644
> --- a/drivers/staging/rtl8192e/rtllib_tx.c
> +++ b/drivers/staging/rtl8192e/rtllib_tx.c
> @@ -297,7 +297,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
> netdev_info(ieee->dev, "%s: can't get TS\n", __func__);
> return;
> }
> - if (pTxTs->TxAdmittedBARecord.bValid == false) {
> + if (!pTxTs->TxAdmittedBARecord.bValid) {
> if (ieee->wpa_ie_len && (ieee->pairwise_key_type ==
> KEY_TYPE_NA)) {
> ;
> @@ -307,7 +307,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
> TsStartAddBaProcess(ieee, pTxTs);
> }
> goto FORCED_AGG_SETTING;
> - } else if (pTxTs->bUsingBa == false) {
> + } else if (!pTxTs->bUsingBa) {
> if (SN_LESS(pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum,
> (pTxTs->TxCurSeq+1)%4096))
> pTxTs->bUsingBa = true;
> @@ -365,9 +365,9 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
> return;
> }
>
> - if ((pHTInfo->bCurBW40MHz == true) && pHTInfo->bCurShortGI40MHz)
> + if (pHTInfo->bCurBW40MHz && pHTInfo->bCurShortGI40MHz)
> tcb_desc->bUseShortGI = true;
> - else if ((pHTInfo->bCurBW40MHz == false) && pHTInfo->bCurShortGI20MHz)
> + else if (!pHTInfo->bCurBW40MHz && pHTInfo->bCurShortGI20MHz)
> tcb_desc->bUseShortGI = true;
> }