staging: rtl8723bs: fix alignment of continued conditions

Fix alignment of continued conditions to improve code readability
and conform to the Linux kernel coding style. This fixes the
PARENTHESIS_ALIGNMENT issues identified by checkpatch.pl.

Signed-off-by: Andrei Khomenkov <khomenkov@mailbox.org>
Link: https://patch.msgid.link/20260427175846.23470-8-khomenkov@mailbox.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index e5de66d00bec8748d959b1f1db1636946987aec0..12bf7780bea591868830c565ddb640c02b8dd181 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -298,7 +298,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
                        rtw_disassoc_cmd(padapter, 0, true);
 
                if (check_fwstate(pmlmepriv, _FW_LINKED) ||
-                       check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
+                   check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
                        rtw_free_assoc_resources(padapter, 1);
 
                if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {
@@ -468,7 +468,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
        u8 short_GI = 0;
 
        if (!check_fwstate(pmlmepriv, _FW_LINKED) &&
-               !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
+           !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
                return 0;
 
        psta = rtw_get_stainfo(&adapter->stapriv, get_bssid(pmlmepriv));

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 3c4c7d9022957db1764b3228732b0f0f88a3a629..4381df2b89d673128296724563e16f5ac68ed6fc 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1758,7 +1758,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
 
        if (rtw_to_roam(adapter) > 0) {
                if (jiffies_to_msecs(jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms ||
-                       !is_same_ess(&competitor->network, &mlme->cur_network.network)
+                   !is_same_ess(&competitor->network, &mlme->cur_network.network)
                )
                        goto exit;
        }

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index b3b9976b15b2ce762cd7c9a01f48ab66c5484419..67570b81034f275599d2337d09a9cc86a020ec26 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -513,7 +513,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)
                return _SUCCESS;
 
        if (!check_fwstate(pmlmepriv, _FW_LINKED) &&
-               !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) {
+           !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) {
                return _SUCCESS;
        }
 

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 098a08c11fe5cde6ad3ee3cb4e3bdfd0bc445ff0..d61b0fd4bfcd0d25953ceb7b7189a765630326e3 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -704,7 +704,7 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *
        signed int bmcast = is_multicast_ether_addr(pattrib->dst);
 
        if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
-               check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
+           check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
 
                /*  filter packets that SA is myself or multicast or broadcast */
                if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {
@@ -834,7 +834,7 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p
                }
 
        } else if (check_fwstate(pmlmepriv, WIFI_MP_STATE) &&
-                    check_fwstate(pmlmepriv, _FW_LINKED)) {
+                  check_fwstate(pmlmepriv, _FW_LINKED)) {
                memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
                memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
                memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
@@ -2170,10 +2170,10 @@ static int recv_func(struct adapter *padapter, union recv_frame *rframe)
 
                /* check if need to enqueue into uc_swdec_pending_queue*/
                if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&
-                       !is_multicast_ether_addr(prxattrib->ra) && prxattrib->encrypt > 0 &&
-                       (prxattrib->bdecrypted == 0 || psecuritypriv->sw_decrypt) &&
-                       psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPAPSK &&
-                       !psecuritypriv->busetkipkey) {
+                   !is_multicast_ether_addr(prxattrib->ra) && prxattrib->encrypt > 0 &&
+                   (prxattrib->bdecrypted == 0 || psecuritypriv->sw_decrypt) &&
+                   psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPAPSK &&
+                   !psecuritypriv->busetkipkey) {
                        rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);
 
                        if (recvpriv->free_recvframe_cnt < NR_RECVFRAME / 4) {

diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 9ac8a8f743979ab66a3162cb9ab1b3d2070a04e4..037a426ed15ec8ea594269252cedd7e5e652ec54 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -691,7 +691,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
        memcpy(pattrib->src, &etherhdr.h_source, ETH_ALEN);
 
        if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
-               check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
+           check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
                memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
                memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
        } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
@@ -963,7 +963,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
                        if (pattrib->qos_en)
                                qos_option = true;
                } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
-               check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
+                          check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
                        memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
                        memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
                        memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);

diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index 426989986cc3775aca2b633f02057fbead3541e7..fba85cc0e7bf34b5fa6fdd6fd71742173d140a7b 100644 (file)
--- 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) {
@@ -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 5cb13a10efd62775d961d33df60190be648a20f9..6123510103599a3614b0e06a754c6543d82c848a 100644 (file)
--- 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/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index f27970ef54c8f797d569b211748642e8139a65c6..b801a78f69e04d6198f04d5f65dbdf6492cc4cf4 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -583,10 +583,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;