From nobody Sat Apr 4 00:12:47 2026 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7045C136672 for ; Sat, 21 Mar 2026 22:06:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774130804; cv=none; b=O98H5K6iFGKkkYds6b27cJnlipAi7CuN+372jc94os5fgseR62YLCc9PL8MjzwCvLGvmQKT065uW5xysNlIPEnPIWeqfCFo2Z3vNq00jiut9DBPHk4PKzJ+4j+9SxqC9kJaftUCHnqx4K8j9LjkVuwHphlBk6yV9PlWOcmv1C/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774130804; c=relaxed/simple; bh=NE+o76cDCY6ufYLT4CXAQE6WZwivoJ3FwGquOiC8/E8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WiOa7pl0Gk5083JIq2gR/D3Iku1TO2bhb3hzrQq8orcs5IU2/5h4ggaWlXPituVYxHVKST5MankRWdMU7sUMJBSN9DGFAdxgpJCg7qTiSlVixY9jkcL5ydEBhhBPkIfa3WTbjsvKmmrmrFeCUiBH6DZl0nFRX3neG9SBymDdkSU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HkVdZ1Kq; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HkVdZ1Kq" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-38bcda08c76so15599771fa.0 for ; Sat, 21 Mar 2026 15:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774130801; x=1774735601; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mWLQ8cISeczolM9g8jaVOfz2uGsgAmc0TWcwEI0STCg=; b=HkVdZ1KqtxBAAWUsUY73uE/1kMQCIKPcqQ3sPvo1JsWF/JjdpX8U/PP8AvFhZ+CipL J2VfJfZI9dqTwIvOtPbN9wgGGObjJpiU21/eCb8GGWItERWvmoBk83jRUIIJEkJq2SGz Ix620HUaYh27OV1zO4dKJQaHnmlr85CPn2LyGlRJnhre2odlWFNhOstt2RoFDxEcCaBj +ZfYSCS0fpUwIzOg+8aFbqCUgXgfBdRColoD0q9uJuLVnQOP5UHiMxJ/cPAwtbYqw6p+ uluK8Hqde+faPf8bX0V2Vh9CKKsy26TPdDi9tbGLJOkcbte4uJnMVq1jG6vHJjtJJbQg JiCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774130801; x=1774735601; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mWLQ8cISeczolM9g8jaVOfz2uGsgAmc0TWcwEI0STCg=; b=GbsKNHtPm2fF1tRg/IbyInT98xdChju79hfbEh4nlsIWy4rHDkVvYKZ139NjKfts4p rI1ZzHXs7AE5Ti/3p9q8aa/PFUyu10vVJ7hrHNIlH6BT745+7kI6HfvOEagd+zgKaT1B u5re0rmgBnNu2RspBuWdr591Zl0eMw9cTUxlmKM1lDpZcpC7+WhxwK7Kl27de/uL+iAq BPXnW8KWaqgtz61Pb8rcVAEWF1mpkQaMG+GdiP7OQxj1TTw9tG2oHaYxz5d3RVrYjVcD bshHS/eGXLlVZSujZ9jOV7EDdmSJunOPGyli8iwuOKbYkbdaI5LD9eyQs4aMk75TyyM2 5Y6A== X-Forwarded-Encrypted: i=1; AJvYcCWflz1ymm8pECrV2quS//XEiXDOHFpCPZk/Y4OVCPgXVh0Rn0fE5iQ1Bm7d4ZFsd6asA4VB9Xr1LTTyQ8M=@vger.kernel.org X-Gm-Message-State: AOJu0Yxg5hWPxGoEt6NVYJHezLlKnKqfNsLDVngOFFfLpEsF1GrXaZj8 82ZGGp7ZQvTSYL7jNIhWhhkqhuKRsQmrcglIwmbSWoIbnyOQlEAamCms X-Gm-Gg: ATEYQzw32mrfrOCxzDVdowLCAR8DqF75DTeReGldHnxDVU+0HYsQPCWnpIF0xeN5AHh L8mAEwpu/ZR9YN3OAQDpcIbLWttgX0chOVoaykuSMS2ofK72ZiZdzJKiNSDpkFdbRDjh5H5ra1w l36PIy18bnrGAPiVoTrcshL/WhSQgeesVfytnSM4zIMLKg4BDNpIlSLMNGWkFxJWHFciWgUM7sC ngAt5eHY3bLcNOX6frr3DadoF9OhxeICqKFcsw3xbJ5PHOmgom0J8YBIgI2eejPcDm1YOE/kb8d ovQ+6uluWpRwv0NSi3pNRkKKaT95jXT8aF3iwT4TSytZAI4sMEGeXY0mzCjuMcGXFvdNmJZ1Mzd vggeBpSlaIsHh6lSBR+XLdiZkv1nimkr3LCi8NM7KCkGM0potpRd9Ruvgw9ya/eUTkOBSYMWM3O Mlyp9G5aPaLA/dexI7f4/1zNDgT1pO1I97jmZb4Jjq09G00Ix6rp/L5Xnw0AJ8wuYp6vqJ5py+H 4X1 X-Received: by 2002:a05:6512:3ba3:b0:5a1:15bd:b057 with SMTP id 2adb3069b0e04-5a28589e931mr2149597e87.0.1774130800182; Sat, 21 Mar 2026 15:06:40 -0700 (PDT) Received: from localhost.localdomain (81-237-238-191-no600.tbcn.telia.com. [81.237.238.191]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a2851adeeasm1353610e87.35.2026.03.21.15.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2026 15:06:38 -0700 (PDT) From: Oskar Ray-Frayssinet To: gregkh@linuxfoundation.org Cc: straube.linux@gmail.com, dan.carpenter@linaro.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Oskar Ray-Frayssinet , kernel test robot Subject: [PATCH v3] staging: rtl8723bs: remove unnecessary braces in single statement blocks Date: Sat, 21 Mar 2026 23:06:12 +0100 Message-ID: <20260321220612.6560-1-rayfraytech@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unnecessary braces around single statement blocks throughout the rtl8723bs driver to comply with kernel coding style. Signed-off-by: Oskar Ray-Frayssinet Reported-by: kernel test robot --- v3: Fix logic bug in HalBtc8723b2Ant.c - use !bBtHsOn instead of bBtHsOn (reported by Dan Carpenter) Revert unrelated change in rtl8723b_cmd.c (0 =3D=3D valid) v2: Fix build error in HalBtc8723b2Ant.c - remove spurious '{' from else-if statement (reported by kernel test robot) Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202603182051.NuXiZYrt-lkp@int= el.com/ v1: Remove unnecessary braces in single statement blocks throughout rtl8723bs driver drivers/staging/rtl8723bs/core/rtw_recv.c | 5 +- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 112 +++++++----------- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 3 +- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 21 ++-- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 9 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 6 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +- drivers/staging/rtl8723bs/hal/odm.c | 4 +- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 3 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 3 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 42 +++---- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 12 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +- 13 files changed, 86 insertions(+), 143 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index 1a52d3e1d285..5aa2f7e1b54a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1339,11 +1339,10 @@ static signed int validate_recv_data_frame(struct a= dapter *adapter, union recv_f =20 } =20 - if (ret =3D=3D _FAIL) { + if (ret =3D=3D _FAIL) goto exit; - } else if (ret =3D=3D RTW_RX_HANDLED) { + else if (ret =3D=3D RTW_RX_HANDLED) goto exit; - } =20 =20 if (!psta) { diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/stag= ing/rtl8723bs/hal/HalBtc8723b2Ant.c index d32dbf94858f..682582920363 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c @@ -35,49 +35,43 @@ static u8 halbtc8723b2ant_BtRssiState( (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) btRssiState =3D BTC_RSSI_STATE_HIGH; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else { - if (btRssi < rssiThresh) { + if (btRssi < rssiThresh) btRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } else if (levelNum =3D=3D 3) { - if (rssiThresh > rssiThresh1) { + if (rssiThresh > rssiThresh1) return pCoexSta->preBtRssiState; - } =20 if ( (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (btRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) btRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else if ( (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_MEDIUM) || (pCoexSta->preBtRssiState =3D=3D BTC_RSSI_STATE_STAY_MEDIUM) ) { - if (btRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (btRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) btRssiState =3D BTC_RSSI_STATE_HIGH; - } else if (btRssi < rssiThresh) { + else if (btRssi < rssiThresh) btRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_MEDIUM; - } } else { - if (btRssi < rssiThresh1) { + if (btRssi < rssiThresh1) btRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else btRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } =20 @@ -104,49 +98,43 @@ static u8 halbtc8723b2ant_WifiRssiState( (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) wifiRssiState =3D BTC_RSSI_STATE_HIGH; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else { - if (wifiRssi < rssiThresh) { + if (wifiRssi < rssiThresh) wifiRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } else if (levelNum =3D=3D 3) { - if (rssiThresh > rssiThresh1) { + if (rssiThresh > rssiThresh1) return pCoexSta->preWifiRssiState[index]; - } =20 if ( (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_LOW) || (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_STAY_LOW) ) { - if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (wifiRssi >=3D (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) wifiRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_LOW; - } } else if ( (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_MEDIUM) || (pCoexSta->preWifiRssiState[index] =3D=3D BTC_RSSI_STATE_STAY_MEDIUM) ) { - if (wifiRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (wifiRssi >=3D (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) wifiRssiState =3D BTC_RSSI_STATE_HIGH; - } else if (wifiRssi < rssiThresh) { + else if (wifiRssi < rssiThresh) wifiRssiState =3D BTC_RSSI_STATE_LOW; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_MEDIUM; - } } else { - if (wifiRssi < rssiThresh1) { + if (wifiRssi < rssiThresh1) wifiRssiState =3D BTC_RSSI_STATE_MEDIUM; - } else { + else wifiRssiState =3D BTC_RSSI_STATE_STAY_HIGH; - } } } =20 @@ -294,9 +282,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_co= exist *pBtCoexist) =20 pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_HS_OPERATION, &bBtHsOn); =20 - if (!pBtLinkInfo->bBtLinkExist) { + if (!pBtLinkInfo->bBtLinkExist) return algorithm; - } =20 if (pBtLinkInfo->bScoExist) numOfDiffProfile++; @@ -319,11 +306,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) } else if (pBtLinkInfo->bA2dpExist) { algorithm =3D BT_8723B_2ANT_COEX_ALGO_A2DP; } else if (pBtLinkInfo->bPanExist) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANHS; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR; - } } } } else if (numOfDiffProfile =3D=3D 2) { @@ -333,11 +319,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) } else if (pBtLinkInfo->bA2dpExist) { algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_HID; } else if (pBtLinkInfo->bPanExist) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_SCO; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_HID; - } } } else { if ( @@ -349,20 +334,18 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) pBtLinkInfo->bHidExist && pBtLinkInfo->bPanExist ) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_HID; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_HID; - } } else if ( pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_A2DP_PANHS; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_A2DP; - } } } } else if (numOfDiffProfile =3D=3D 3) { @@ -389,11 +372,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_= coexist *pBtCoexist) pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { - if (bBtHsOn) { + if (bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_HID_A2DP; - } else { + else algorithm =3D BT_8723B_2ANT_COEX_ALGO_HID_A2DP_PANEDR; - } } } } else if (numOfDiffProfile >=3D 3) { @@ -403,10 +385,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_c= oexist *pBtCoexist) pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { - if (bBtHsOn) { - } else { + if (!bBtHsOn) algorithm =3D BT_8723B_2ANT_COEX_ALGO_PANEDR_HID; - } } } } @@ -480,9 +460,8 @@ static void halbtc8723b2ant_SetSwRfRxLpfCorner( } else { /* Resume RF Rx LPF corner */ /* After initialized, we can use pCoexDm->btRf0x1eBackup */ - if (pBtCoexist->bInitilized) { + if (pBtCoexist->bInitilized) pBtCoexist->fBtcSetRfReg(pBtCoexist, BTC_RF_A, 0x1e, 0xfffff, pCoexDm->= btRf0x1eBackup); - } } } =20 @@ -2202,13 +2181,11 @@ static void halbtc8723b2ant_RunCoexistMechanism(str= uct btc_coexist *pBtCoexist) { u8 algorithm =3D 0; =20 - if (pBtCoexist->bManualControl) { + if (pBtCoexist->bManualControl) return; - } =20 - if (pCoexSta->bUnderIps) { + if (pCoexSta->bUnderIps) return; - } =20 algorithm =3D halbtc8723b2ant_ActionAlgorithm(pBtCoexist); if (pCoexSta->bC2hBtInquiryPage && (BT_8723B_2ANT_COEX_ALGO_PANHS !=3D al= gorithm)) { @@ -2226,9 +2203,8 @@ static void halbtc8723b2ant_RunCoexistMechanism(struc= t btc_coexist *pBtCoexist) if (halbtc8723b2ant_IsCommonAction(pBtCoexist)) { pCoexDm->bAutoTdmaAdjust =3D false; } else { - if (pCoexDm->curAlgorithm !=3D pCoexDm->preAlgorithm) { + if (pCoexDm->curAlgorithm !=3D pCoexDm->preAlgorithm) pCoexDm->bAutoTdmaAdjust =3D false; - } =20 =20 switch (pCoexDm->curAlgorithm) { @@ -2406,11 +2382,10 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist= *pBtCoexist, u8 type) =20 void EXhalbtc8723b2ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type) { - if (type =3D=3D BTC_LPS_ENABLE) { + if (type =3D=3D BTC_LPS_ENABLE) pCoexSta->bUnderLps =3D true; - } else if (type =3D=3D BTC_LPS_DISABLE) { + else if (type =3D=3D BTC_LPS_DISABLE) pCoexSta->bUnderLps =3D false; - } } =20 void EXhalbtc8723b2ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type) @@ -2486,9 +2461,8 @@ void EXhalbtc8723b2ant_BtInfoNotify( =20 } =20 - if (pBtCoexist->bManualControl) { + if (pBtCoexist->bManualControl) return; - } =20 if (BT_INFO_SRC_8723B_2ANT_WIFI_FW !=3D rspSource) { pCoexSta->btRetryCnt =3D pCoexSta->btInfoC2h[rspSource][2] & 0xf; /* [3:= 0] */ diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl= 8723bs/hal/HalPhyRf.c index 7bef05a9a063..5d2562dae16a 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c @@ -118,9 +118,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct ad= apter *Adapter) } =20 /* Calculate Average ThermalValue after average enough times */ - if (ThermalValue_AVG_count) { + if (ThermalValue_AVG_count) ThermalValue =3D (u8)(ThermalValue_AVG / ThermalValue_AVG_count); - } =20 /* 4 5. Calculate delta, delta_LCK */ /* delta" here is used to determine whether thermal value changes or not.= */ diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/stagi= ng/rtl8723bs/hal/HalPhyRf_8723B.c index 8f6849f2277e..50e81a67138b 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c @@ -1108,9 +1108,8 @@ static void _PHY_SaveADDARegisters8723B( if (!ODM_CheckPowerStatus(padapter)) return; =20 - for (i =3D 0 ; i < RegisterNum ; i++) { + for (i =3D 0 ; i < RegisterNum ; i++) ADDABackup[i] =3D PHY_QueryBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWor= d); - } } =20 =20 @@ -1122,9 +1121,8 @@ static void _PHY_SaveMACRegisters8723B( struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); struct dm_odm_t *pDM_Odm =3D &pHalData->odmpriv; =20 - for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) { + for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) MACBackup[i] =3D rtw_read8(pDM_Odm->Adapter, MACReg[i]); - } MACBackup[i] =3D rtw_read32(pDM_Odm->Adapter, MACReg[i]); =20 } @@ -1141,9 +1139,8 @@ static void _PHY_ReloadADDARegisters8723B( struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); struct dm_odm_t *pDM_Odm =3D &pHalData->odmpriv; =20 - for (i =3D 0 ; i < RegiesterNum; i++) { + for (i =3D 0 ; i < RegiesterNum; i++) PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, ADDABackup[i]); - } } =20 static void _PHY_ReloadMACRegisters8723B( @@ -1152,9 +1149,8 @@ static void _PHY_ReloadMACRegisters8723B( { u32 i; =20 - for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) { + for (i =3D 0 ; i < (IQK_MAC_REG_NUM - 1); i++) rtw_write8(padapter, MACReg[i], (u8)MACBackup[i]); - } rtw_write32(padapter, MACReg[i], MACBackup[i]); } =20 @@ -1178,9 +1174,8 @@ static void _PHY_PathADDAOn8723B( PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[0], bMaskDWord, pathOn); } =20 - for (i =3D 1 ; i < IQK_ADDA_REG_NUM ; i++) { + for (i =3D 1 ; i < IQK_ADDA_REG_NUM ; i++) PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, pathOn); - } =20 } =20 @@ -1194,9 +1189,8 @@ static void _PHY_MACSettingCalibration8723B( =20 rtw_write8(pDM_Odm->Adapter, MACReg[i], 0x3F); =20 - for (i =3D 1 ; i < (IQK_MAC_REG_NUM - 1); i++) { + for (i =3D 1 ; i < (IQK_MAC_REG_NUM - 1); i++) rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT3))); - } rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT5))); =20 } @@ -1528,9 +1522,8 @@ static void phy_LCCalibrate_8723B(struct dm_odm_t *pD= M_Odm, bool is2T) PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xB0, bRFRegOffsetMask, 0xDFFE0= ); /* LDO OFF */ =20 /* Channel 10 LC calibration issue for 8723bs with 26M xtal */ - if (pDM_Odm->SupportInterface =3D=3D ODM_ITRF_SDIO && pDM_Odm->PackageTyp= e >=3D 0x2) { + if (pDM_Odm->SupportInterface =3D=3D ODM_ITRF_SDIO && pDM_Odm->PackageTyp= e >=3D 0x2) PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal= ); - } =20 /* Restore original situation */ if ((tmpReg&0x70) !=3D 0) { /* Deal with contisuous TX case */ diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/r= tl8723bs/hal/hal_btcoex.c index 9c84f4cf1dda..012ddbae68a1 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -1026,15 +1026,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_= coexist *pBtCoexist, u8 pktTy if (pBtCoexist->bManualControl) return; =20 - if (pktType =3D=3D PACKET_DHCP) { + if (pktType =3D=3D PACKET_DHCP) packetType =3D BTC_PACKET_DHCP; - } else if (pktType =3D=3D PACKET_EAPOL) { + else if (pktType =3D=3D PACKET_EAPOL) packetType =3D BTC_PACKET_EAPOL; - } else if (pktType =3D=3D PACKET_ARP) { + else if (pktType =3D=3D PACKET_ARP) packetType =3D BTC_PACKET_ARP; - } else { + else return; - } =20 /* All notify is called in cmd thread, don't need to leave low power aga= in */ /* halbtcoutsrc_LeaveLowPower(pBtCoexist); */ diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/stagi= ng/rtl8723bs/hal/hal_com_phycfg.c index dc2da49e6738..736d99d6cd4b 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -323,9 +323,8 @@ static void PHY_StoreTxPowerByRateNew(struct adapter *p= adapter, u32 RfPath, if (RfPath >=3D RF_PATH_MAX) return; =20 - for (i =3D 0; i < rateNum; ++i) { + for (i =3D 0; i < rateNum; ++i) pHalData->TxPwrByRateOffset[RfPath][rateIndex[i]] =3D PwrByRateVal[i]; - } } =20 static void PHY_StoreTxPowerByRateOld( @@ -361,9 +360,8 @@ void PHY_StoreTxPowerByRate( =20 if (pDM_Odm->PhyRegPgVersion > 0) PHY_StoreTxPowerByRateNew(padapter, RfPath, RegAddr, BitMask, Data); - else if (pDM_Odm->PhyRegPgVersion =3D=3D 0) { + else if (pDM_Odm->PhyRegPgVersion =3D=3D 0) PHY_StoreTxPowerByRateOld(padapter, RegAddr, BitMask, Data); - } } =20 static void diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl= 8723bs/hal/hal_intf.c index 27c0c0198714..45634b5e5082 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -208,9 +208,8 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 r= ssi_level) =20 if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) add_ratid(padapter, psta, rssi_level); - else { + else UpdateHalRAMask8723B(padapter, psta->mac_id, rssi_level); - } } =20 void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 = rssi_level) @@ -254,9 +253,8 @@ void rtw_hal_dm_watchdog(struct adapter *padapter) =20 void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter) { - if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) { + if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in i= nterrupt context */ - } } =20 void beacon_timing_control(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723b= s/hal/odm.c index 639b6da2302b..859c816911e2 100644 --- a/drivers/staging/rtl8723bs/hal/odm.c +++ b/drivers/staging/rtl8723bs/hal/odm.c @@ -270,9 +270,9 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm= _t *pDM_Odm) if (is_multicast_ether_addr(pstat->hwaddr)) /* if (psta->mac_id =3D=3D= 1) */ continue; =20 - if (true =3D=3D ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedS= moothedPWDB, false, &pstat->rssi_level)) { + if (ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, + false, &pstat->rssi_level)) rtw_hal_update_ra_mask(pstat, pstat->rssi_level); - } =20 } } diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging= /rtl8723bs/hal/odm_HWConfig.c index 994b8c578e7a..1e67e27994c7 100644 --- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c +++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c @@ -240,9 +240,8 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *= dm_odm, if (is_cck_rate) { phy_info->signal_strength =3D (u8)(odm_signal_scale_mapping(dm_odm, pwdb= _all)); } else { - if (rf_rx_num !=3D 0) { + if (rf_rx_num !=3D 0) phy_info->signal_strength =3D (u8)(odm_signal_scale_mapping(dm_odm, tot= al_rssi /=3D rf_rx_num)); - } } } =20 diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging= /rtl8723bs/hal/rtl8723b_cmd.c index af6cdda8238d..a44f5bd58306 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c @@ -25,9 +25,8 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, = u8 msgbox_num) =20 do { valid =3D rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num); - if (0 =3D=3D valid) { + if (0 =3D=3D valid) read_down =3D true; - } } while ((!read_down) && (retry_cnts--)); =20 return read_down; diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 513d0c346c5e..87817bef180e 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -197,9 +197,8 @@ static s32 polling_fwdl_chksum( yield(); } while (jiffies_to_msecs(jiffies-start) < timeout_ms || cnt < min_cnt); =20 - if (!(value32 & FWDL_ChkSum_rpt)) { + if (!(value32 & FWDL_ChkSum_rpt)) goto exit; - } =20 if (g_fwdl_chksum_fail) { g_fwdl_chksum_fail--; @@ -238,9 +237,8 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min= _cnt, u32 timeout_ms) yield(); } while (jiffies_to_msecs(jiffies - start) < timeout_ms || cnt < min_cnt); =20 - if (!(value32 & WINTINI_RDY)) { + if (!(value32 & WINTINI_RDY)) goto exit; - } =20 if (g_fwdl_wintint_rdy_fail) { g_fwdl_wintint_rdy_fail--; @@ -1048,9 +1046,8 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u= 32 mac_id, u8 rssi_level) rate_bitmap =3D hal_btcoex_GetRaMask(padapter); mask &=3D ~rate_bitmap; =20 - if (pHalData->fw_ractrl) { + if (pHalData->fw_ractrl) rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, psta->bw_mo= de, short_gi_rate, mask); - } =20 /* set correct initial date rate for each mac_id */ pdmpriv->INIDATA_RATE[mac_id] =3D psta->init_rate; @@ -1203,9 +1200,9 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u= 8 *hwinfo) =20 /* Check 0x8129 again for making sure autoload status!! */ EEPROMId =3D le16_to_cpu(*((__le16 *)hwinfo)); - if (EEPROMId !=3D RTL_EEPROM_ID) { + if (EEPROMId !=3D RTL_EEPROM_ID) pEEPROM->bautoload_fail_flag =3D true; - } else + else pEEPROM->bautoload_fail_flag =3D false; } =20 @@ -1590,13 +1587,12 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct = pkt_attrib *pattrib) if (pattrib->bwmode =3D=3D CHANNEL_WIDTH_40) { SCSettingOfDesc =3D HT_DATA_SC_DONOT_CARE; } else if (pattrib->bwmode =3D=3D CHANNEL_WIDTH_20) { - if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_UPPER) { + if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_UPPER) SCSettingOfDesc =3D HT_DATA_SC_20_UPPER_OF_40MHZ; - } else if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_LOWE= R) { + else if (pHalData->nCur40MhzPrimeSC =3D=3D HAL_PRIME_CHNL_OFFSET_LOWER) SCSettingOfDesc =3D HT_DATA_SC_20_LOWER_OF_40MHZ; - } else { + else SCSettingOfDesc =3D HT_DATA_SC_DONOT_CARE; - } } } else { SCSettingOfDesc =3D HT_DATA_SC_DONOT_CARE; @@ -1621,9 +1617,8 @@ static void rtl8723b_cal_txdesc_chksum(struct tx_desc= *ptxdesc) /* Thomas, Lucas@SD4, 20130515 */ count =3D 16; =20 - for (index =3D 0; index < count; index++) { + for (index =3D 0; index < count; index++) checksum |=3D le16_to_cpu(*(__le16 *)(usPtr + index)); - } =20 ptxdesc->txdw7 |=3D cpu_to_le32(checksum & 0x0000ffff); } @@ -1796,11 +1791,10 @@ static void rtl8723b_fill_default_txdesc( ptxdesc->mbssid =3D pattrib->mbssid & 0xF; =20 ptxdesc->rty_lmt_en =3D 1; /* retry limit enable */ - if (pattrib->retry_ctrl) { + if (pattrib->retry_ctrl) ptxdesc->data_rt_lmt =3D 6; - } else { + else ptxdesc->data_rt_lmt =3D 12; - } =20 ptxdesc->datarate =3D MRateToHwRate(pmlmeext->tx_rate); =20 @@ -1891,9 +1885,8 @@ void rtl8723b_fill_fake_txdesc( SET_TX_DESC_HWSEQ_SEL_8723B(pDesc, 0); } =20 - if (IsBTQosNull) { + if (IsBTQosNull) SET_TX_DESC_BT_INT_8723B(pDesc, 1); - } =20 SET_TX_DESC_USE_RATE_8723B(pDesc, 1); /* use data rate which is set by S= w */ SET_TX_DESC_OWN_8723B((u8 *)pDesc, 1); @@ -2209,9 +2202,8 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u= 8 *pdata, u8 len) #define GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(_Header) LE_BITS_TO_1BYTE((_He= ader + 0), 6, 1) #define GET_8723B_C2H_TX_RPT_RETRY_OVER(_Header) LE_BITS_TO_1BYTE((_Header= + 0), 7, 1) =20 - if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TI= ME_OVER(pdata)) { + if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TI= ME_OVER(pdata)) rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); - } /* else if (seq_no !=3D padapter->xmitpriv.seq_no) { rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); @@ -2578,9 +2570,8 @@ void SetHwReg8723B(struct adapter *padapter, u8 varia= ble, u8 *val) =20 /* Forece leave RF low power mode for 1T1R to prevent conficting setti= ng in Fw power */ /* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yscha= ng. */ - if (psmode !=3D PS_MODE_ACTIVE) { + if (psmode !=3D PS_MODE_ACTIVE) ODM_RF_Saving(&pHalData->odmpriv, true); - } =20 /* if (psmode !=3D PS_MODE_ACTIVE) { */ /* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */ @@ -2894,11 +2885,10 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum= hal_def_variable variable, v break; =20 case HAL_DEF_TX_PAGE_BOUNDARY: - if (!padapter->registrypriv.wifi_spec) { + if (!padapter->registrypriv.wifi_spec) *(u8 *)pval =3D TX_PAGE_BOUNDARY_8723B; - } else { + else *(u8 *)pval =3D WMM_NORMAL_TX_PAGE_BOUNDARY_8723B; - } break; =20 case HAL_DEF_MACID_SLEEP: diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index 379d29d3f9d3..f31884a0dfc1 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -140,9 +140,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter) return _SUCCESS; =20 ret =3D rtw_register_tx_alive(padapter); - if (ret !=3D _SUCCESS) { + if (ret !=3D _SUCCESS) return _SUCCESS; - } =20 do { queue_empty =3D rtl8723_dequeue_writeport(padapter); @@ -373,9 +372,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padap= ter) spin_lock_bh(&pxmitpriv->lock); ret =3D rtw_txframes_pending(padapter); spin_unlock_bh(&pxmitpriv->lock); - if (ret =3D=3D 0) { + if (ret =3D=3D 0) return _SUCCESS; - } =20 /* dequeue frame and write to hardware */ =20 @@ -393,9 +391,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padap= ter) spin_lock_bh(&pxmitpriv->lock); ret =3D rtw_txframes_pending(padapter); spin_unlock_bh(&pxmitpriv->lock); - if (ret =3D=3D 1) { + if (ret =3D=3D 1) goto next; - } =20 return _SUCCESS; } @@ -410,9 +407,8 @@ int rtl8723bs_xmit_thread(void *context) =20 do { ret =3D rtl8723bs_xmit_handler(padapter); - if (signal_pending(current)) { + if (signal_pending(current)) flush_signals(current); - } } while (_SUCCESS =3D=3D ret); =20 complete(&pxmitpriv->SdioXmitTerminate); diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index d664e254912c..a86252ccac76 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -146,9 +146,8 @@ static void sdio_deinit(struct dvobj_priv *dvobj) sdio_claim_host(func); sdio_disable_func(func); =20 - if (dvobj->irq_alloc) { + if (dvobj->irq_alloc) sdio_release_irq(func); - } =20 sdio_release_host(func); } --=20 2.43.0