From nobody Thu Apr 9 06:19:01 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81CF7C433FE for ; Thu, 3 Nov 2022 07:02:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230244AbiKCHCi (ORCPT ); Thu, 3 Nov 2022 03:02:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbiKCHCc (ORCPT ); Thu, 3 Nov 2022 03:02:32 -0400 Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A518317436 for ; Thu, 3 Nov 2022 00:02:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1667458938; bh=LbwkXUJkhNlCZNV3zGGjX8aci4KU7P3XQszdxoLXxF4=; h=X-EA-Auth:Date:From:To:Subject:Message-ID:MIME-Version: Content-Type; b=NEb7IcCWROFjQN/qMdp4a6OisJXKve86BDL4yC2gcYL+snDeVZG2Ju6ISpWMyx19O 6+fe7LXmLvY7dSqgEeIEFx7TUlu0F4jfhTFGh+ackh5WdrYN6tmPm5I3Ale4t2AT5E YcB/8xczq7tw76PH3bPsKGVv613SKItEzYQvtFQ0= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via [213.182.55.206] Thu, 3 Nov 2022 08:02:18 +0100 (CET) X-EA-Auth: ccrmxYZEVx8BpUWbzEc8nx2bv9/66wZ3TA05DA56RNT+NYYXFgTHrxOhDfj2yqcH1vHQbnvb9+J6Wi5oVEz5RJO9dSzqcYqd Date: Thu, 3 Nov 2022 12:32:09 +0530 From: Deepak R Varma To: outreachy@lists.linux.dev, Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: rtl8723bs: Use min/max macros for variable comparison Message-ID: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify code by using min and max helper macros in place of lengthy if/else block oriented logical evaluation and value assignment. This issue is identified by coccicheck using the minmax.cocci file. Signed-off-by: Deepak R Varma --- Please note: 1. Using min for max_AMPDU_len computation warning was NOT auto generate= d by the cocciecheck command. This was caught while surround code review a= nd was manually changed. 2. Checkpatch script continues to complaint about min_MPDU_spacing computation line being more than 100 character in length. I did not f= ind a better formatting that will address this checkpatch warning. Any suggestions are most welcome. 3. Proposed changes are compile tested only on my x86 based VM. drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 12 ++++-------- drivers/staging/rtl8723bs/hal/odm_DIG.c | 5 +---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/stagi= ng/rtl8723bs/core/rtw_wlan_util.c index 18ba846c0b7b..dcda587b84bc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -986,15 +986,11 @@ void HT_caps_handler(struct adapter *padapter, struct= ndis_80211_var_ie *pIE) pmlmeinfo->HT_caps.u.HT_cap[i] &=3D (pIE->data[i]); } else { /* modify from fw by Thomas 2010/11/17 */ - if ((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x3) > (pIE->data= [i] & 0x3)) - max_AMPDU_len =3D (pIE->data[i] & 0x3); - else - max_AMPDU_len =3D (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x= 3); + max_AMPDU_len =3D min((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para &= 0x3), + (pIE->data[i] & 0x3)); - if ((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) > (pIE->dat= a[i] & 0x1c)) - min_MPDU_spacing =3D (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para &= 0x1c); - else - min_MPDU_spacing =3D (pIE->data[i] & 0x1c); + min_MPDU_spacing =3D max((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_par= a & 0x1c), + (pIE->data[i] & 0x1c)); pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para =3D max_AMPDU_len | min_= MPDU_spacing; } diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8= 723bs/hal/odm_DIG.c index 07edf74ccfe5..97a51546463a 100644 --- a/drivers/staging/rtl8723bs/hal/odm_DIG.c +++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c @@ -598,10 +598,7 @@ void odm_DIGbyRSSI_LPS(void *pDM_VOID) /* Lower bound checking */ /* RSSI Lower bound check */ - if ((pDM_Odm->RSSI_Min-10) > DM_DIG_MIN_NIC) - RSSI_Lower =3D pDM_Odm->RSSI_Min-10; - else - RSSI_Lower =3D DM_DIG_MIN_NIC; + RSSI_Lower =3D max(pDM_Odm->RSSI_Min - 10, DM_DIG_MIN_NIC); /* Upper and Lower Bound checking */ if (CurrentIGI > DM_DIG_MAX_NIC) -- 2.34.1