From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9A84C432BE for ; Wed, 4 Aug 2021 18:47:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4C3561040 for ; Wed, 4 Aug 2021 18:47:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237576AbhHDSr4 (ORCPT ); Wed, 4 Aug 2021 14:47:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:58256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240562AbhHDSrA (ORCPT ); Wed, 4 Aug 2021 14:47:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8D20060EE9; Wed, 4 Aug 2021 18:46:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628102808; bh=Z0AMCBYZWMFG/732Trem2uyECkXKzKW3+VAiIP0p6V4=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=JnIFhgNFwMr7gr0m8gY3k+f8l4ogJqin83HhIfbOpCaCD0HKbDfUAUEk3ykm8wb1e fPh6TkD+aFTT1bpQeRSIEuJ3dCohwrezrn74tcXNLFk6jKkKNeiJbV2OHRQ3zxaFFO DPliLj+9gXuKIFFtPMPByfeQbZlKSEHvuflVqbtf7Y7eLiA1TQa5kHxyiuhJsJph3F WSBuFX1CQI7yWgYMZJLVFLDz5Fs+2azU+4gugqZIe8dxTouwc/zeMDSkNfJ4v9HzVr VA56vm/nQ9wCv7k0HMfkDr6RjGu1qJCfPEeXWtPAGumXy+rMGJXeYozW2QscRorlSB tv/z8oPraDMrQ== Subject: Re: [PATCH 2/4] staging: r8188eu: Remove unnecessary parentheses To: Nick Desaulniers Cc: Greg Kroah-Hartman , Phillip Potter , Larry Finger , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com References: <20210803223609.1627280-1-nathan@kernel.org> <20210803223609.1627280-3-nathan@kernel.org> From: Nathan Chancellor Message-ID: Date: Wed, 4 Aug 2021 11:46:46 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/4/2021 10:46 AM, Nick Desaulniers wrote: > On Tue, Aug 3, 2021 at 3:36 PM Nathan Chancellor wrote: >> >> Clang warns several times across the driver along the lines of: >> >> drivers/staging/r8188eu/core/rtw_pwrctrl.c:222:21: warning: equality >> comparison with extraneous parentheses [-Wparentheses-equality] >> if ((pwrpriv->rpwm == pslv)) { >> ~~~~~~~~~~~~~~^~~~~~~ >> drivers/staging/r8188eu/core/rtw_pwrctrl.c:222:21: note: remove >> extraneous parentheses around the comparison to silence this warning >> if ((pwrpriv->rpwm == pslv)) { >> ~ ^ ~ >> drivers/staging/r8188eu/core/rtw_pwrctrl.c:222:21: note: use '=' to turn >> this equality comparison into an assignment >> if ((pwrpriv->rpwm == pslv)) { >> ^~ >> = >> 1 warning generated. >> >> The compilers have agreed that single parentheses are used for equality >> and double parentheses are used for assignment within control flow >> statements such as if and while so remove them in these places to fix >> the warning. >> >> Signed-off-by: Nathan Chancellor >> --- >> drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- >> drivers/staging/r8188eu/core/rtw_security.c | 4 ++-- >> drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- >> drivers/staging/r8188eu/hal/odm.c | 2 +- >> drivers/staging/r8188eu/hal/usb_halinit.c | 2 +- >> 5 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r8188eu/core/rtw_pwrctrl.c >> index d67eeb045002..598c32d7eaa5 100644 >> --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c >> +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c >> @@ -219,7 +219,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv) >> pslv = PS_STATE_S3; >> } >> >> - if ((pwrpriv->rpwm == pslv)) { >> + if (pwrpriv->rpwm == pslv) { >> RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, >> ("%s: Already set rpwm[0x%02X], new=0x%02X!\n", __func__, pwrpriv->rpwm, pslv)); >> return; >> diff --git a/drivers/staging/r8188eu/core/rtw_security.c b/drivers/staging/r8188eu/core/rtw_security.c >> index 2c1b9a6dcdf2..45fd8b1aeb59 100644 >> --- a/drivers/staging/r8188eu/core/rtw_security.c >> +++ b/drivers/staging/r8188eu/core/rtw_security.c >> @@ -1211,7 +1211,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) >> pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset; >> >> /* 4 start to encrypt each fragment */ >> - if ((pattrib->encrypt == _AES_)) { >> + if (pattrib->encrypt == _AES_) { >> if (pattrib->psta) >> stainfo = pattrib->psta; >> else >> @@ -1454,7 +1454,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) >> >> pframe = (unsigned char *)((struct recv_frame *)precvframe)->rx_data; >> /* 4 start to encrypt each fragment */ >> - if ((prxattrib->encrypt == _AES_)) { >> + if (prxattrib->encrypt == _AES_) { >> stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]); >> if (stainfo != NULL) { >> RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_decrypt: stainfo!= NULL!!!\n")); >> diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c >> index 15edccef9f1d..4a8e52484cfd 100644 >> --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c >> +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c >> @@ -1306,7 +1306,7 @@ int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps) >> if (!(pmlmeinfo->HT_enable)) >> return _FAIL; >> >> - if ((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_RALINK)) >> + if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_RALINK) >> return _FAIL; >> >> bit_offset = (pmlmeext->cur_bwmode & HT_CHANNEL_WIDTH_40) ? 6 : 5; >> diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c >> index 0bc836311036..65a117408d50 100644 >> --- a/drivers/staging/r8188eu/hal/odm.c >> +++ b/drivers/staging/r8188eu/hal/odm.c >> @@ -1631,7 +1631,7 @@ void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm) >> struct mlme_ext_priv *pmlmeext = &(Adapter->mlmeextpriv); >> struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); >> >> - if ((pregpriv->wifi_spec == 1))/* (pmlmeinfo->HT_enable == 0)) */ >> + if (pregpriv->wifi_spec == 1) > > ^ was the comment you removed important? I doubt it, it looks like commented out code, which presumably means it did not work. I have cleaned up dead comments like this at the same time as cleaning up warnings in the past without any issues. > If not: > Reviewed-by: Nick Desaulniers Thanks for the review! Cheers, Nathan >> goto dm_CheckEdcaTurbo_EXIT; >> >> if (pmlmeinfo->assoc_AP_vendor >= HT_IOT_PEER_MAX) >> diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c >> index d985894c0f30..ec7badfd72aa 100644 >> --- a/drivers/staging/r8188eu/hal/usb_halinit.c >> +++ b/drivers/staging/r8188eu/hal/usb_halinit.c >> @@ -1300,7 +1300,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8 *val) >> StopTxBeacon(Adapter); >> >> rtw_write8(Adapter, REG_BCN_CTRL, 0x19);/* disable atim wnd */ >> - } else if ((mode == _HW_STATE_ADHOC_)) { >> + } else if (mode == _HW_STATE_ADHOC_) { >> ResumeTxBeacon(Adapter); >> rtw_write8(Adapter, REG_BCN_CTRL, 0x1a); >> } else if (mode == _HW_STATE_AP_) { >> -- >> 2.33.0.rc0 >>