From: Fabio Aiuto <fabioaiuto83@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v2 21/43] staging: rtl8723bs: remove empty if-else blocks after BTC_PRINT removal
Date: Fri, 30 Apr 2021 16:43:51 +0200 [thread overview]
Message-ID: <0f900bf15be532f2f224ae17c8fb7615dbca225f.1619793406.git.fabioaiuto83@gmail.com> (raw)
In-Reply-To: <cover.1619793405.git.fabioaiuto83@gmail.com>
remove if-else blocks left empty after BTC_PRINT removal.
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 16 +---------------
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 12 +-----------
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
index 28f41a637c96..57579d7eab71 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
@@ -606,8 +606,7 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)
pBtLinkInfo->bPanExist &&
pBtLinkInfo->bA2dpExist
) {
- if (bBtHsOn) {
- } else {
+ if (!bBtHsOn) {
algorithm = BT_8723B_1ANT_COEX_ALGO_PANEDR_HID;
}
}
@@ -1063,10 +1062,6 @@ static void halbtc8723b1ant_PsTdma(
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy);
- if (pCoexDm->bCurPsTdmaOn) {
- } else {
- }
-
if (!bForceExec) {
if (
(pCoexDm->bPrePsTdmaOn == pCoexDm->bCurPsTdmaOn) &&
@@ -1373,10 +1368,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist)
bCommon = true;
} else {
- if (bWifiBusy) {
- } else {
- }
-
bCommon = false;
}
@@ -1528,7 +1519,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl(
halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, 1);
pCoexDm->psTdmaDuAdjType = 1;
}
- } else { /* no change */
}
if (
@@ -3012,10 +3002,6 @@ void EXhalbtc8723b1ant_BtInfoNotify(
pCoexSta->btInfoC2h[rspSource][i] = tmpBuf[i];
if (i == 1)
btInfo = tmpBuf[i];
- if (i == length - 1)
- {}
- else
- {}
}
if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rspSource) {
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
index 73f1cc6bc27c..15304feb2442 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
@@ -1621,8 +1621,7 @@ static void halbtc8723b2ant_TdmaDurationAdjust(
if (!bScan && !bLink && !bRoam)
halbtc8723b2ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, pCoexDm->psTdmaDuAdjType);
- else {
- }
+
}
}
@@ -2859,10 +2858,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type
u8 wifiCentralChnl;
u8 apNum = 0;
- if (BTC_MEDIA_CONNECT == type) {
- } else {
- }
-
/* only 2.4G we need to inform bt the chnl mask */
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL, &wifiCentralChnl);
if ((BTC_MEDIA_CONNECT == type) && (wifiCentralChnl <= 14)) {
@@ -2889,8 +2884,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type
void EXhalbtc8723b2ant_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 type)
{
- if (type == BTC_PACKET_DHCP) {
- }
}
void EXhalbtc8723b2ant_BtInfoNotify(
@@ -2915,9 +2908,6 @@ void EXhalbtc8723b2ant_BtInfoNotify(
if (i == 1)
btInfo = tmpBuf[i];
- if (i == length - 1) {
- } else {
- }
}
if (pBtCoexist->bManualControl) {
--
2.20.1
next prev parent reply other threads:[~2021-04-30 14:45 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 14:43 [PATCH v2 00/43] staging: rtl8723bs: clean up driver from private debug facilities Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 01/43] staging: rtl8723bs: remove ODM_RT_TRACE logs Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 02/43] staging: rlt8723bs: remove if-else blocks left empty by ODM_RT_TRACE deletion Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 03/43] staging: rtl8723bs: remove empty functions Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 04/43] staging: rtl8723bs: remove empty hal/odm_PathDiv.c source file Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 05/43] staging: rtl8723bs: remove undefined function prototypes Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 06/43] staging: rtl8723bs: remove empty header file Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 07/43] staging: rtl8723bs: remove ODM_RT_TRACE* unused macro defs Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 08/43] staging: rtl8723bs: remove all commented out ODM_RT_TRACE logs Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 09/43] staging: rtl8723bs: replace ODM_RT_ASSERT with netdev_dbg() Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 10/43] staging: rtl8723bs: remove unused ODM_RT_ASSERT macro Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 11/43] staging: rtl8723bs: remove unused ODM_PRINT_ADDR macro Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 12/43] staging: rtl8723bs: remove unused ODM_dbg_trace macro Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 13/43] staging: rtl8723bs: remove unused ODM_dbg_enter Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 14/43] staging: rtl8723bs: remove unused ODM_dbg_exit macro Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 15/43] staging: rtl8723bs: remove empty ifdef block Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 16/43] staging: rtl8723bs: remove unused ASSERT macro Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 17/43] staging: rtl8723bs: remove empty #ifndef block Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 18/43] staging: rtl8723bs: remove commented out RT_ASSERT occurrences Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 19/43] staging: rtl8723bs: remove unused RT_PRINTK macro Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 20/43] staging: rtl8723bs: remove BTC_PRINT logs Fabio Aiuto
2021-04-30 14:43 ` Fabio Aiuto [this message]
2021-04-30 14:43 ` [PATCH v2 22/43] staging: rtl8723bs: remove braces around single statement in if block Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 23/43] staging: rtl8723bs: remove commented out BTC_PRINT logs Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 24/43] staging: rtl8723bs: remove BTC_PRINT macro definitions Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 25/43] staging: rtl8723bs: remove BTC_PRINT_ADDR " Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 26/43] staging: rtl8723bs: remove BTC_PRINT_DATA definitions Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 27/43] staging: rtl8723bs: remove BTC_PRINT_F macro definition Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 28/43] staging: rtl8723bs: remove empty #ifdef block Fabio Aiuto
2021-04-30 14:43 ` [PATCH v2 29/43] staging: rtl8723bs: remove unsed hal_btcoex_SetDBG() function Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 30/43] staging: rtl8723bs: remove hal_btcoex_GetDBG() function Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 31/43] staging: rtl8723bs: remove unnecessary halbtcoutsrc_DbgInit() function Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 32/43] staging: rtl8723bs: remove obsolete GLBtcDbgType array declarations Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 33/43] staging: rtl8723bs: remove unused enum Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 34/43] staging: rtl8723bs: remove obsolete debug macros Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 35/43] staging: rtl8723bs: remove commented out DbgPrint logs Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 36/43] staging: rtl8723bs: remove unused DbgPrint macro Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 37/43] staging: rtl8723bs: remove commented out *RT_DISP logs Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 38/43] staging: rtl8723bs: remove RT_DISP macro definition Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 39/43] staging: rtl8723bs: remove ODM_InitDebugSetting() function Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 40/43] staging: rtl8723bs: remove empty hal/odm_debug.c file Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 41/43] staging: rtl8723bs: remove member in dm_odm_t struct Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 42/43] staging: rtl8723bs: remove DebugLevel " Fabio Aiuto
2021-04-30 14:44 ` [PATCH v2 43/43] staging: rtl8723bs: remove odm_debug.h header file Fabio Aiuto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f900bf15be532f2f224ae17c8fb7615dbca225f.1619793406.git.fabioaiuto83@gmail.com \
--to=fabioaiuto83@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).