[RFT PATCH v3 0/5] staging: rtl8723bs: Code cleanup in drivers/staging/rtl8723bs

[Prithvi Tambewagh <activprithvi@gmail.com>]

This patch series focuses on code cleanup in drivers/staging/rtl8723bs,
majorly focusing on fixing checkpatch warnings of constant being on right
side of test in comparisons, deletion of empty if block ,use of 
read_poll_timeout_atomic(), and other code simplifications.

v2 link: https://lore.kernel.org/linux-staging/20260403094647.fmgop6xh2cjpit3s@inspiron/T/#m3d08fd012119772e>
v1 link: https://lore.kernel.org/linux-staging/20260323145214.ubhshy2gwp52j5zh@inspiron/T/#mc3b693b37c49fbdd>

Note:
1. I found that for this change in v2:

-       if (
-               (false == pHalData->bDisableSWChannelPlan) &&
-               rtw_is_channel_plan_valid(sw_channel_plan)
-       )
+       if (!pHalData->bDisableSWChannelPlan &&
+           rtw_is_channel_plan_valid(sw_channel_plan))

for this code, checkpatch gave the check:

CHECK: Using comparison to false is error prone
#126: FILE: drivers/staging/rtl8723bs/hal/hal_com.c:126:
+               (false == pHalData->bDisableSWChannelPlan) &&

which is a different logical change than the ones covered in this patch series.
Hence, to keep the patch series to a reasonable length and since this is RFT
path series, I did not consider this change right now.

2. This change in v2:

        if (BandWidth == CHANNEL_WIDTH_20) { /*  BW20-1S, BW20-2S */
-               if (MGN_MCS0 <= Rate && Rate <= MGN_MCS7)
+               if (Rate >= MGN_MCS0 && Rate <= MGN_MCS7)
                        txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
        } else if (BandWidth == CHANNEL_WIDTH_40) { /*  BW40-1S, BW40-2S */
-               if (MGN_MCS0 <= Rate && Rate <= MGN_MCS7)
+               if (Rate >= MGN_MCS0 && Rate <= MGN_MCS7)
                        txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
        }

can be reformatted as:

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 9e523491a008..efd1c76f2953 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -469,11 +469,10 @@ u8 PHY_GetTxPowerIndexBase(
        if ((Rate >= MGN_6M && Rate <= MGN_54M) && !IS_CCK_RATE(Rate))
                txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S];
 
-       if (BandWidth == CHANNEL_WIDTH_20) { /*  BW20-1S, BW20-2S */
-               if (MGN_MCS0 <= Rate && Rate <= MGN_MCS7)
+       if (Rate >= MGN_MCS0 && Rate <= MGN_MCS7) {
+               if (BandWidth == CHANNEL_WIDTH_20) /*  BW20-1S, BW20-2S */
                        txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
-       } else if (BandWidth == CHANNEL_WIDTH_40) { /*  BW40-1S, BW40-2S */
-               if (MGN_MCS0 <= Rate && Rate <= MGN_MCS7)
+               else if (BandWidth == CHANNEL_WIDTH_40) /*  BW40-1S, BW40-2S */
                        txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
for which it is sent as a separate patch - patch 5 in this series.

3. I found, in drivers/staging/rtl8723bs/hal/odm.h:

struct odm_rate_adaptive {
        u8 Type;                                /*  DM_Type_ByFW/DM_Type_ByDriver */
        u8 LdpcThres;                   /*  if RSSI > LdpcThres => switch from LPDC to BCC */
        bool bUseLdpc;
        bool bLowerRtsRate;
        u8 HighRSSIThresh;              /*  if RSSI > HighRSSIThresh    => RATRState is DM_RATR_STA_HIGH */
        u8 LowRSSIThresh;               /*  if RSSI <= LowRSSIThresh    => RATRState is DM_RATR_STA_LOW */
        u8 RATRState;                   /*  Current RSSI level, DM_RATR_STA_HIGH/DM_RATR_STA_MIDDLE/DM_RATR_>

};

and based on the explanation of parameters HighRSSIThresh & LowRSSIThresh 
I thought this change:

diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 639b6da2302b..ca4495f101fd 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -343,9 +343,9 @@ bool ODM_RAStateCheck(
        }
 
        /*  Decide RATRState by RSSI. */
-       if (RSSI > HighRSSIThreshForRA)
+       if (HighRSSIThreshForRA < RSSI)
                RATRState = DM_RATR_STA_HIGH;
-       else if (RSSI > LowRSSIThreshForRA)
+       else if (LowRSSIThreshForRA < RSSI) 
                RATRState = DM_RATR_STA_MIDDLE;
       else
                RATRState = DM_RATR_STA_LOW;

doesn't seem to be right, thats why I dropped this change as well.

4. This patch series is compile tested using the following commands, which
   include setting the necessary configurations:
        1. make defconfig
        2. scripts/config --enable CONFIG_STAGING
        3. scripts/config --module CONFIG_MMC
        4. scripts/config --module CONFIG_RTL8723BS
        5. make olddefconfig
        6. make -j$(nproc)
        7. git rebase -i --exec "make -j$(nproc) M=drivers/staging/rtl8723bs" HEAD~5 

The final rebase --exec gave a successful output:

Executing: make -j12 M=drivers/staging/rtl8723bs
make[1]: Entering directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
  CC [M]  core/rtw_ap.o
  CC [M]  core/rtw_btcoex.o
  CC [M]  core/rtw_cmd.o
  CC [M]  core/rtw_efuse.o
  CC [M]  core/rtw_io.o
  CC [M]  core/rtw_ioctl_set.o
  CC [M]  core/rtw_ieee80211.o
  CC [M]  core/rtw_mlme.o
  CC [M]  core/rtw_mlme_ext.o
  CC [M]  core/rtw_pwrctrl.o
  CC [M]  core/rtw_recv.o
  CC [M]  core/rtw_security.o
  CC [M]  core/rtw_sta_mgt.o
  CC [M]  core/rtw_wlan_util.o
  CC [M]  core/rtw_xmit.o
  CC [M]  hal/hal_intf.o
  CC [M]  hal/hal_com.o
  CC [M]  hal/hal_com_phycfg.o
  CC [M]  hal/hal_btcoex.o
  CC [M]  hal/hal_sdio.o
  CC [M]  hal/hal_pwr_seq.o
  CC [M]  hal/HalPhyRf.o
  CC [M]  hal/HalPwrSeqCmd.o
  CC [M]  hal/odm_CfoTracking.o
  CC [M]  hal/odm.o
  CC [M]  hal/odm_DIG.o
  CC [M]  hal/odm_DynamicBBPowerSaving.o
  CC [M]  hal/odm_DynamicTxPower.o
  CC [M]  hal/odm_EdcaTurboCheck.o
  CC [M]  hal/odm_HWConfig.o
  CC [M]  hal/odm_RegConfig8723B.o
  CC [M]  hal/rtl8723b_cmd.o
  CC [M]  hal/rtl8723b_dm.o
  CC [M]  hal/rtl8723b_hal_init.o
  CC [M]  hal/rtl8723b_phycfg.o
  CC [M]  hal/rtl8723b_rf6052.o
  CC [M]  hal/rtl8723b_rxdesc.o
  CC [M]  hal/rtl8723bs_recv.o
  CC [M]  hal/rtl8723bs_xmit.o
  CC [M]  hal/sdio_halinit.o
  CC [M]  hal/sdio_ops.o
  CC [M]  hal/HalBtc8723b1Ant.o
  CC [M]  hal/HalBtc8723b2Ant.o
  CC [M]  hal/HalHWImg8723B_BB.o
  CC [M]  hal/HalHWImg8723B_MAC.o
  CC [M]  hal/HalHWImg8723B_RF.o
  CC [M]  hal/HalPhyRf_8723B.o
  CC [M]  os_dep/ioctl_cfg80211.o
  CC [M]  os_dep/osdep_service.o
  CC [M]  os_dep/os_intfs.o
  CC [M]  os_dep/sdio_intf.o
  CC [M]  os_dep/sdio_ops_linux.o
  CC [M]  os_dep/wifi_regd.o
  CC [M]  os_dep/xmit_linux.o
  LD [M]  r8723bs.o
  MODPOST Module.symvers
  CC [M]  r8723bs.mod.o
  CC [M]  .module-common.o
  LD [M]  r8723bs.ko
make[1]: Leaving directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
Executing: make -j12 M=drivers/staging/rtl8723bs
make[1]: Entering directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
  CC [M]  hal/HalPhyRf_8723B.o
  LD [M]  r8723bs.o
  MODPOST Module.symvers
  CC [M]  r8723bs.mod.o
  LD [M]  r8723bs.ko
make[1]: Leaving directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
Executing: make -j12 M=drivers/staging/rtl8723bs
make[1]: Entering directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
  CC [M]  core/rtw_ap.o
  CC [M]  core/rtw_btcoex.o
  CC [M]  core/rtw_cmd.o
  CC [M]  core/rtw_efuse.o
  CC [M]  core/rtw_io.o
  CC [M]  core/rtw_ioctl_set.o
  CC [M]  core/rtw_ieee80211.o
  CC [M]  core/rtw_mlme.o
  CC [M]  core/rtw_mlme_ext.o
  CC [M]  core/rtw_pwrctrl.o
  CC [M]  core/rtw_recv.o
  CC [M]  core/rtw_security.o
  CC [M]  core/rtw_sta_mgt.o
  CC [M]  core/rtw_wlan_util.o
  CC [M]  core/rtw_xmit.o
  CC [M]  hal/hal_intf.o
  CC [M]  hal/hal_com.o
  CC [M]  hal/hal_com_phycfg.o
  CC [M]  hal/hal_btcoex.o
  CC [M]  hal/hal_sdio.o
  CC [M]  hal/hal_pwr_seq.o
  CC [M]  hal/HalPhyRf.o
  CC [M]  hal/HalPwrSeqCmd.o
  CC [M]  hal/odm.o
  CC [M]  hal/odm_CfoTracking.o
  CC [M]  hal/odm_DIG.o
  CC [M]  hal/odm_DynamicBBPowerSaving.o
  CC [M]  hal/odm_DynamicTxPower.o
  CC [M]  hal/odm_EdcaTurboCheck.o
  CC [M]  hal/odm_HWConfig.o
  CC [M]  hal/odm_RegConfig8723B.o
  CC [M]  hal/rtl8723b_cmd.o
  CC [M]  hal/rtl8723b_dm.o
  CC [M]  hal/rtl8723b_hal_init.o
  CC [M]  hal/rtl8723b_phycfg.o
  CC [M]  hal/rtl8723b_rf6052.o
  CC [M]  hal/rtl8723b_rxdesc.o
  CC [M]  hal/rtl8723bs_recv.o
  CC [M]  hal/rtl8723bs_xmit.o
  CC [M]  hal/sdio_halinit.o
  CC [M]  hal/sdio_ops.o
  CC [M]  hal/HalBtc8723b1Ant.o
  CC [M]  hal/HalBtc8723b2Ant.o
  CC [M]  hal/HalHWImg8723B_BB.o
  CC [M]  hal/HalHWImg8723B_MAC.o
  CC [M]  hal/HalHWImg8723B_RF.o
  CC [M]  hal/HalPhyRf_8723B.o
  CC [M]  os_dep/ioctl_cfg80211.o
  CC [M]  os_dep/osdep_service.o
  CC [M]  os_dep/os_intfs.o
  CC [M]  os_dep/sdio_intf.o
  CC [M]  os_dep/sdio_ops_linux.o
  CC [M]  os_dep/wifi_regd.o
  CC [M]  os_dep/xmit_linux.o
  LD [M]  r8723bs.o
  MODPOST Module.symvers
  LD [M]  r8723bs.ko
make[1]: Leaving directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
Executing: make -j12 M=drivers/staging/rtl8723bs
make[1]: Entering directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
  CC [M]  hal/rtl8723b_cmd.o
  LD [M]  r8723bs.o
  MODPOST Module.symvers
  CC [M]  r8723bs.mod.o
  LD [M]  r8723bs.ko
make[1]: Leaving directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
Executing: make -j12 M=drivers/staging/rtl8723bs
make[1]: Entering directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
  CC [M]  hal/hal_com_phycfg.o
  LD [M]  r8723bs.o
  MODPOST Module.symvers
  CC [M]  r8723bs.mod.o
  LD [M]  r8723bs.ko
make[1]: Leaving directory '/home/prithvi/linux/drivers/staging/rtl8723bs'
Successfully rebased and updated refs/heads/staging-realtek-patch-series.

However, since I currently don't have rtl8723bs hardware I am unfortunately
unable to do runtime testing for this patch series.

Prithvi Tambewagh (5):
  staging: rtl8723bs: move constant to right side of test in comparison
  staging: rtl8723bs: remove empty if statement block
  staging: rtl8723bs: simplify boolean return in IsFrameTypeCtrl()
  staging: rtl8723bs: use read_poll_timeout_atomic in
    _is_fw_read_cmd_down
  staging: rtl8723bs: remove duplicate rate checks in
    PHY_GetTxPowerIndexBase()

 .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c    |  4 ++--
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c |  5 +----
 drivers/staging/rtl8723bs/hal/hal_com.c        |  2 +-
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 11 +++++------
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c   | 18 +++++++-----------
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c  | 18 +++++++++---------
 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c |  2 +-
 drivers/staging/rtl8723bs/include/ieee80211.h  |  4 ++--
 drivers/staging/rtl8723bs/include/wifi.h       |  5 +----
 9 files changed, 29 insertions(+), 40 deletions(-)

-- 
2.34.1