From: Andrei Khomenkov <khomenkov@mailbox.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Luka Gejak <luka.gejak@linux.dev>,
Ethan Tidmore <ethantidmore06@gmail.com>,
Dan Carpenter <error27@gmail.com>,
linux-staging@lists.linux.dev
Subject: [PATCH v3 5/6] staging: rtl8723bs: hal: style cleanup
Date: Thu, 2 Apr 2026 18:04:28 +0300 [thread overview]
Message-ID: <20260402150429.14761-6-khomenkov@mailbox.org> (raw)
In-Reply-To: <20260402150429.14761-1-khomenkov@mailbox.org>
Cleanup coding style errors in the lines modified by the
previous logic changes. This includes removing extra
parentheses, fixing line wrapping for if-conditions, and
adding spaces around bitwise operators.
These changes are only style related and do not affect
the logic.
Signed-off-by: Andrei Khomenkov <khomenkov@mailbox.org>
---
drivers/staging/rtl8723bs/hal/hal_com.c | 2 +-
drivers/staging/rtl8723bs/hal/odm.c | 11 ++++------
drivers/staging/rtl8723bs/hal/odm_DIG.c | 20 ++++++++-----------
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 6 ++----
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 5 +++--
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++----
6 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 48b35e0945e9..a3ef7320ae9a 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -605,7 +605,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)
odm->SupportAbility = *((u32 *)val);
break;
case HW_VAR_DM_FUNC_OP:
- if (*((u8 *)val)) {
+ if (*(u8 *)val) {
/* save dm flag */
odm->BK_SupportAbility = odm->SupportAbility;
} else {
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index e75c5655c699..758dcf47206f 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -380,12 +380,9 @@ static void FindMinimumRSSI(struct adapter *padapter)
/* 1 1.Determine the minimum RSSI */
- if (
- (!pDM_Odm->bLinked) &&
- (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)
- ) {
+ if (!pDM_Odm->bLinked && pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)
pdmpriv->MinUndecoratedPWDBForDM = 0;
- } else
+ else
pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
@@ -431,7 +428,7 @@ static void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm)
for (i = 0; i < sta_cnt; i++) {
if (PWDB_rssi[i] != (0)) {
- if (pHalData->fw_ractrl)/* Report every sta's RSSI to FW */
+ if (pHalData->fw_ractrl) /* Report every sta's RSSI to FW */
rtl8723b_set_rssi_cmd(Adapter, (u8 *)(&PWDB_rssi[i]));
}
}
@@ -623,7 +620,7 @@ void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm)
}
odm_CCKPacketDetectionThresh(pDM_Odm);
- if (*(pDM_Odm->pbPowerSaving))
+ if (*pDM_Odm->pbPowerSaving)
return;
diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index a380bbcb636f..9a5425c0ee1d 100644
--- a/drivers/staging/rtl8723bs/hal/odm_DIG.c
+++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c
@@ -251,12 +251,10 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI)
} else
EDCCA_State = true;
- if (
- pDM_Odm->bLinked &&
- !pDM_Odm->Carrier_Sense_enable &&
- !pDM_Odm->NHM_disable &&
- !pDM_Odm->TxHangFlg
- )
+ if (pDM_Odm->bLinked &&
+ !pDM_Odm->Carrier_Sense_enable &&
+ !pDM_Odm->NHM_disable &&
+ !pDM_Odm->TxHangFlg)
odm_NHMBB(pDM_Odm);
if (EDCCA_State) {
@@ -393,8 +391,8 @@ void odm_DIG(void *pDM_VOID)
/* 1 Update status */
DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_0;
- FirstConnect = (pDM_Odm->bLinked) && !(pDM_DigTable->bMediaConnect_0);
- FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0);
+ FirstConnect = pDM_Odm->bLinked && !pDM_DigTable->bMediaConnect_0;
+ FirstDisConnect = !pDM_Odm->bLinked && pDM_DigTable->bMediaConnect_0;
/* 1 Boundary Decision */
/* 2 For WIN\CE */
@@ -527,10 +525,8 @@ void odm_DIG(void *pDM_VOID)
CurrentIGI = pDM_DigTable->rx_gain_range_max;
/* 1 Force upper bound and lower bound for adaptivity */
- if (
- pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY &&
- pDM_Odm->adaptivity_flag
- ) {
+ if (pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY &&
+ pDM_Odm->adaptivity_flag) {
if (CurrentIGI > Adap_IGI_Upper)
CurrentIGI = Adap_IGI_Upper;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
index 195814de0df2..612351010359 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
@@ -137,10 +137,8 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter)
fw_current_in_ps_mode = adapter_to_pwrctl(Adapter)->fw_current_in_ps_mode;
rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&bFwPSAwake));
- if (
- (hw_init_completed) &&
- ((!fw_current_in_ps_mode) && bFwPSAwake)
- ) {
+ if (hw_init_completed &&
+ (!fw_current_in_ps_mode && bFwPSAwake)) {
rtw_hal_check_rxfifo_full(Adapter);
}
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 91fa289f81b7..95361e856adf 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -998,7 +998,8 @@ void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)
rtw_write32(padapter, REG_TCR, value32);
/* NOTE: Fix test chip's bug (about contention windows's randomness) */
- if (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)) {
+ if (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE |
+ WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) {
rtw_write8(padapter, REG_RXTSF_OFFSET_CCK, 0x50);
rtw_write8(padapter, REG_RXTSF_OFFSET_OFDM, 0x50);
}
@@ -2118,7 +2119,7 @@ static void hw_var_set_mlme_sitesurvey(struct adapter *padapter, u8 variable, u8
/* config RCR to receive different BSSID & not to receive data frame */
value_rxfltmap2 = 0;
- if ((check_fwstate(pmlmepriv, WIFI_AP_STATE)))
+ if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
rcr_clear_bit = RCR_CBSSID_BCN;
value_rcr = rtw_read32(padapter, REG_RCR);
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index f4073f6a342f..55a85f8aa38d 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -596,10 +596,8 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)
pHalData = GET_HAL_DATA(padapter);
pwrctrlpriv = adapter_to_pwrctl(padapter);
- if (
- adapter_to_pwrctl(padapter)->bips_processing &&
- adapter_to_pwrctl(padapter)->pre_ips_type == 0
- ) {
+ if (adapter_to_pwrctl(padapter)->bips_processing &&
+ adapter_to_pwrctl(padapter)->pre_ips_type == 0) {
unsigned long start_time;
u8 cpwm_orig, cpwm_now;
u8 val8, bMacPwrCtrlOn = true;
--
2.53.0
next prev parent reply other threads:[~2026-04-02 15:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-02 15:04 [PATCH v3 0/6] staging: rtl8723bs: cleanup code and style Andrei Khomenkov
2026-04-02 15:04 ` [PATCH v3 1/6] staging: rtl8723bs: core: simplify boolean comparisons Andrei Khomenkov
2026-04-02 16:41 ` Dan Carpenter
2026-04-02 15:04 ` [PATCH v3 2/6] staging: rtl8723bs: hal: " Andrei Khomenkov
2026-04-02 15:04 ` [PATCH v3 3/6] staging: rtl8723bs: os_dep: " Andrei Khomenkov
2026-04-02 15:04 ` [PATCH v3 4/6] staging: rtl8723bs: core: style cleanup Andrei Khomenkov
2026-04-02 15:04 ` Andrei Khomenkov [this message]
2026-04-02 16:46 ` [PATCH v3 5/6] staging: rtl8723bs: hal: " Dan Carpenter
2026-04-02 15:04 ` [PATCH v3 6/6] staging: rtl8723bs: os_dep: " Andrei Khomenkov
2026-04-02 21:43 ` [PATCH v3 0/6] staging: rtl8723bs: cleanup code and style Ethan Tidmore
2026-04-03 6:40 ` Greg Kroah-Hartman
2026-04-03 7:14 ` Ethan Tidmore
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=20260402150429.14761-6-khomenkov@mailbox.org \
--to=khomenkov@mailbox.org \
--cc=error27@gmail.com \
--cc=ethantidmore06@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-staging@lists.linux.dev \
--cc=luka.gejak@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