staging: rtl8723bs: cleanup code and style
v2 cover staging: rtl8723bs: cleanup code and style
This series of patches cleans up the rtl8723bs driver code to improve readability and better align with the Linux kernel coding style. The first patch simplifies boolean comparisons, while the second one performs general code cleanup.
v2:
- Split the single patch into a two-patch series to separate logical changes, as suggested by Luka Gejak.
- Cleaned up additional boolean comparisons found using 'git grep'.
Andrei Khomenkov (2):
staging: rtl8723bs: simplify boolean comparisons
staging: rtl8723bs: cleanup code style and parentheses
drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 4 +- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 50 ++++++------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 16 ++--- drivers/staging/rtl8723bs/core/rtw_recv.c | 72 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 37 +++++----- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +-- drivers/staging/rtl8723bs/hal/hal_com.c | 4 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 4 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +- drivers/staging/rtl8723bs/hal/odm.c | 8 +-- .../staging/rtl8723bs/hal/odm_CfoTracking.c | 2 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 32 ++++----- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 10 +-- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 13 ++-- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 51 ++++++------- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 4 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 ++-- 26 files changed, 194 insertions(+), 198 deletions(-)
Signature · 1 line
2.53.0
PATCH v2 1/2 staging: rtl8723bs: simplify boolean comparisons
Simplify boolean comparisons to improve code readability and match the kernel coding style.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 50 ++++++------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 14 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 16 ++--- drivers/staging/rtl8723bs/core/rtw_recv.c | 70 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 30 ++++---- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +-- drivers/staging/rtl8723bs/hal/hal_com.c | 4 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 4 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +- drivers/staging/rtl8723bs/hal/odm.c | 8 +-- .../staging/rtl8723bs/hal/odm_CfoTracking.c | 2 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 24 +++---- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 10 +-- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 12 ++-- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 48 ++++++------- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 4 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 4 +- 26 files changed, 176 insertions(+), 176 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +1 -1
@@ -301,7 +301,7 @@ void expire_timeout_chk(struct adapter *padapter) psta->keep_alive_trycnt =0 ;spin_lock_bh (&pstapriv->asoc_list_lock); -if (list_empty (&psta->asoc_list) == false) { +if (!list_empty (&psta->asoc_list)) {list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated = ap_free_sta(padapter, psta, false,
drivers/staging/rtl8723bs/core/rtw_btcoex.c +1 -1
@@ -11,7 +11,7 @@void rtw_btcoex_MediaStatusNotify (struct adapter *padapter,u8 media_status) {if ((media_status ==RT_MEDIA_CONNECT ) - && (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true)) { + && (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ))) {rtw_hal_set_hwreg (padapter,HW_VAR_DL_RSVD_PAGE ,NULL ); }
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -347,7 +347,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)/* HT Cap. */ if ((pregistrypriv->wireless_mode &WIRELESS_11_24N ) && - (pregistrypriv->ht_enable == true)) { + (pregistrypriv->ht_enable)) {/* todo: */ }
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +25 -25
152 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_mlme.c +7 -7
@@ -351,7 +351,7 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feau16 s_cap, d_cap;__le16 tmps, tmpd; -if (rtw_bug_check (dst, src, &s_cap, &d_cap) == false) +if (!rtw_bug_check (dst, src, &s_cap, &d_cap))return false;memcpy ((u8 *)&tmps,rtw_get_capability_from_ie (src->ies),2 );
@@ -1301,7 +1301,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *ptarget_wlan =NULL ; -if (rtw_access_ctrl (adapter, pstassoc->macaddr) == false) +if (!rtw_access_ctrl (adapter, pstassoc->macaddr))return ;if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {
@@ -1585,7 +1585,7 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter)if (pmlmeinfo->VHT_enable)/* disable auto scan when connect to 11AC AP */ mlme->auto_scan_int_ms =0 ; -else if (adapter->registrypriv.wifi_spec &&is_client_associated_to_ap (adapter) == true) +else if (adapter->registrypriv.wifi_spec &&is_client_associated_to_ap (adapter)) mlme->auto_scan_int_ms =60 *1000 ;else if (rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) {if (check_fwstate (mlme,WIFI_STATION_STATE ) &&check_fwstate (mlme, _FW_LINKED))
@@ -1687,10 +1687,10 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlmeint updated = false; struct adapter *adapter = container_of(mlme, struct adapter, mlmepriv); -if (is_same_ess (&competitor->network, &mlme->cur_network.network) == false) +if (!is_same_ess (&competitor->network, &mlme->cur_network.network)) goto exit; -if (rtw_is_desired_network (adapter, competitor) == false) +if (!rtw_is_desired_network (adapter, competitor)) goto exit;/* got specific addr to roam */
@@ -1782,12 +1782,12 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme goto exit; } -if (rtw_is_desired_network (adapter, competitor) == false) +if (!rtw_is_desired_network (adapter, competitor)) goto exit;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) == false + || !is_same_ess (&competitor->network, &mlme->cur_network.network) ) goto exit; }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +8 -8
@@ -512,8 +512,8 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ))return _SUCCESS; -if (check_fwstate (pmlmepriv, _FW_LINKED) == false && -check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE |WIFI_AP_STATE ) == false) { +if (!check_fwstate (pmlmepriv, _FW_LINKED) && + !check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE |WIFI_AP_STATE )) {return _SUCCESS; }
@@ -725,7 +725,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) goto auth_fail; } -if (rtw_access_ctrl (padapter, sa) == false) { +if (!rtw_access_ctrl (padapter, sa)) { status =WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA ; goto auth_fail; }
@@ -748,7 +748,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) }else {spin_lock_bh (&pstapriv->asoc_list_lock); -if (list_empty (&pstat->asoc_list) == false) { +if (!list_empty (&pstat->asoc_list)) {list_del_init (&pstat->asoc_list); pstapriv->asoc_list_cnt--;if (pstat->expire_to >0 ) {
@@ -1239,7 +1239,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->flags &= ~WLAN_STA_HT ; -if ((pmlmepriv->htpriv.ht_option == false) && (pstat->flags&WLAN_STA_HT )) { +if ((!pmlmepriv->htpriv.ht_option) && (pstat->flags &WLAN_STA_HT )) { status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail; }
@@ -1474,7 +1474,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)u8 updated = false;spin_lock_bh (&pstapriv->asoc_list_lock); -if (list_empty (&psta->asoc_list) == false) { +if (!list_empty (&psta->asoc_list)) {list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, false, reason);
@@ -1546,7 +1546,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)u8 updated = false;spin_lock_bh (&pstapriv->asoc_list_lock); -if (list_empty (&psta->asoc_list) == false) { +if (!list_empty (&psta->asoc_list)) {list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, false, reason);
@@ -4973,7 +4973,7 @@ void linked_status_chk(struct adapter *padapter)/* todo: To check why we under miracast session, rx_chk would be false */ psta =rtw_get_stainfo (pstapriv, pmlmeinfo->network.mac_address);if (psta) { -if (chk_ap_is_alive (padapter, psta) == false) +if (!chk_ap_is_alive (padapter, psta)) rx_chk = _FAIL;if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts)
drivers/staging/rtl8723bs/core/rtw_recv.c +35 -35
226 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +1 -1
@@ -531,7 +531,7 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);if (!memcmp (paclnode->addr, mac_addr,ETH_ALEN )) -if (paclnode->valid == true) { +if (paclnode->valid) { match = true;break ; }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +9 -9
@@ -147,7 +147,7 @@ unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset)default : rate =ratetbl_val_2wifirate (rate); -if (is_basicrate (padapter, rate) == true) +if (is_basicrate (padapter, rate)) rate |=IEEE80211_BASIC_RATE_MASK ; rateset[len] = rate;
@@ -236,7 +236,7 @@ void Restore_DM_Func_Flag(struct adapter *padapter)void Switch_DM_Func (struct adapter *padapter,u32 mode,u8 enable) { -if (enable == true) +if (enable)rtw_hal_set_hwreg (padapter,HW_VAR_DM_FUNC_SET , (u8 *)(&mode));else rtw_hal_set_hwreg (padapter,HW_VAR_DM_FUNC_CLR , (u8 *)(&mode));
@@ -847,7 +847,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_if (!pIE)return ; -if (phtpriv->ht_option == false) +if (!phtpriv->ht_option)return ;if (pIE->length >sizeof (struct HT_info_element ))
@@ -931,7 +931,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)if (!pIE)return ; -if (phtpriv->ht_option == false) +if (!phtpriv->ht_option)return ; pmlmeinfo->HT_caps_enable =1 ;
@@ -994,7 +994,7 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)if (!pIE)return ; -if (phtpriv->ht_option == false) +if (!phtpriv->ht_option)return ;if (pIE->length >sizeof (struct HT_info_element ))
@@ -1122,7 +1122,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;int ssid_len; -if (is_client_associated_to_ap (Adapter) == false) +if (!is_client_associated_to_ap (Adapter))return true; len = packet_len -sizeof (struct ieee80211_hdr_3addr );
@@ -1689,7 +1689,7 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) pmlmeext->bcn_delay_cnt[delay_ms]++;/* pmlmeext->bcn_delay_ratio[delay_ms] = (pmlmeext->bcn_delay_cnt[delay_ms] * 100) /pmlmeext->bcn_cnt; */ /* dump for adaptive_early_32k */ -if (pmlmeext->bcn_cnt >100 && (pmlmeext->adaptive_tsf_done == true)) { +if (pmlmeext->bcn_cnt >100 && (pmlmeext->adaptive_tsf_done)) {u8 ratio_20_delay, ratio_80_delay;u8 DrvBcnEarly, DrvBcnTimeOut;
@@ -1737,7 +1737,7 @@ void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta)spin_lock_bh (&pdvobj->lock);for (i =0 ; i <NUM_STA ; i++) { -if (pdvobj->macid[i] == false) { +if (!pdvobj->macid[i]) { pdvobj->macid[i] = true;break ; }
@@ -1762,7 +1762,7 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta)spin_lock_bh (&pdvobj->lock);if (psta->mac_id <NUM_STA && psta->mac_id !=1 ) { -if (pdvobj->macid[psta->mac_id] == true) { +if (pdvobj->macid[psta->mac_id]) { pdvobj->macid[psta->mac_id] = false; psta->mac_id =NUM_STA ; }
drivers/staging/rtl8723bs/core/rtw_xmit.c +15 -15
@@ -386,7 +386,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * }else {while (true) {/* IOT action */ -if ((pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS ) && (pattrib->ampdu_en == true) && +if ((pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS ) && (pattrib->ampdu_en) && (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { pattrib->vcs_mode =CTS_TO_SELF ;break ;
@@ -422,7 +422,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame */* to do list: check MIMO power save condition. */ /* check AMPDU aggregation for TXOP */ -if (pattrib->ampdu_en == true) { +if (pattrib->ampdu_en) { pattrib->vcs_mode =RTS_CTS ;break ; }
@@ -484,10 +484,10 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pmemset (pattrib->dot11tkiptxmickey.skey,0 ,16 ); pattrib->mac_id = psta->mac_id; -if (psta->ieee8021x_blocked == true) { +if (psta->ieee8021x_blocked) { pattrib->encrypt =0 ; -if ((pattrib->ether_type !=0x888e ) && (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == false)) { +if ((pattrib->ether_type !=0x888e ) && (!check_fwstate (pmlmepriv,WIFI_MP_STATE ))) { res = _FAIL; goto exit; }
@@ -652,8 +652,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pmemcpy (pattrib->dst, ðerhdr.h_dest,ETH_ALEN );memcpy (pattrib->src, ðerhdr.h_source,ETH_ALEN ); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { +if ((check_fwstate (pmlmepriv,WIFI_ADHOC_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 )) {
@@ -719,7 +719,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (!psta) {/* if we cannot get psta => drop the pkt */ res = _FAIL; goto exit; - }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) && (!(psta->state & _FW_LINKED))) { + } else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) && (!(psta->state & _FW_LINKED))) { res = _FAIL; goto exit; }
@@ -924,8 +924,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pattrib->qos_en) qos_option = true; - }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { + }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_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 );
@@ -983,7 +983,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr pattrib->ampdu_en = true;/* re-check if enable ampdu by BA_starting_seqctrl */ -if (pattrib->ampdu_en == true) { +if (pattrib->ampdu_en) {u16 tx_seq; tx_seq = psta->BA_starting_seqctrl[pattrib->priority &0x0f ];
@@ -1140,7 +1140,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct frg_inx++; -if (bmcst || (rtw_endofpktfile (&pktfile) == true)) { +if (bmcst || (rtw_endofpktfile (&pktfile))) { pattrib->nr_frags = frg_inx; pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len +
@@ -1166,7 +1166,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structxmitframe_swencrypt (padapter, pxmitframe); -if (bmcst == false) +if (!bmcst)update_attrib_vcs_info (padapter, pxmitframe);else pattrib->vcs_mode =NONE_VCS ;
@@ -2002,14 +2002,14 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)do_queue_select (padapter, &pxmitframe->attrib);spin_lock_bh (&pxmitpriv->lock); -if (xmitframe_enqueue_for_sleeping_sta (padapter, pxmitframe) == true) { +if (xmitframe_enqueue_for_sleeping_sta (padapter, pxmitframe)) {spin_unlock_bh (&pxmitpriv->lock);return 1 ; }spin_unlock_bh (&pxmitpriv->lock);/* pre_xmitframe */ -if (rtw_hal_xmit (padapter, pxmitframe) == false) +if (!rtw_hal_xmit (padapter, pxmitframe))return 1 ;return 0 ;
@@ -2053,7 +2053,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xsigned int bmcst =is_multicast_ether_addr (pattrib->ra);bool update_tim = false; -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == false) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return ret; psta =rtw_get_stainfo (&padapter->stapriv, pattrib->ra);if (pattrib->psta != psta)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +5 -5
@@ -164,8 +164,8 @@ static u8 halbtcoutsrc_IsWifiBusy(struct adapter *padapter) pmlmepriv = &padapter->mlmepriv; -if (check_fwstate (pmlmepriv,WIFI_ASOC_STATE ) == true) { -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_ASOC_STATE )) { +if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))return true;if (pmlmepriv->link_detect_info.busy_traffic)return true;
@@ -185,8 +185,8 @@ static u32 _halbtcoutsrc_GetWifiLinkStatus(struct adapter *padapter) bp2p = false; portConnectedStatus =0 ; -if (check_fwstate (pmlmepriv,WIFI_ASOC_STATE ) == true) { -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ASOC_STATE )) { +if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {if (bp2p) portConnectedStatus |=WIFI_P2P_GO_CONNECTED ;else
@@ -528,7 +528,7 @@ static u8 halbtcoutsrc_Set(void *pBtcContext, u8 setType, void *pInBuf)case BTC_SET_ACT_UPDATE_RAMASK : pBtCoexist->btInfo.raMask = *pU4Tmp; -if (check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE ) == true) { +if (check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE )) {struct sta_info *psta;struct wlan_bssid_ex *cur_network;
drivers/staging/rtl8723bs/hal/hal_com.c +2 -2
@@ -136,7 +136,7 @@ bool HAL_IsLegalChannel(struct adapter *adapter, u32 Channel)bool bLegalChannel = true;if ((Channel <=14 ) && (Channel >=1 )) { -if (is_supported_24g (adapter->registrypriv.wireless_mode) == false) +if (!is_supported_24g (adapter->registrypriv.wireless_mode)) bLegalChannel = false; }else { bLegalChannel = false;
@@ -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) == true) { +if (*((u8 *)val)) {/* save dm flag */ odm->BK_SupportAbility = odm->SupportAbility; }else {
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +2 -2
@@ -461,7 +461,7 @@ u8 PHY_GetTxPowerIndexBase(u8 txPower =0 ;u8 chnlIdx = (Channel-1 ); -if (HAL_IsLegalChannel (padapter, Channel) == false) +if (!HAL_IsLegalChannel (padapter, Channel)) chnlIdx =0 ;if (IS_CCK_RATE (Rate))
@@ -490,7 +490,7 @@ s8 PHY_GetTxPowerTrackingOffset(struct adapter *padapter, u8 RFPath, u8 Rate)struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;s8 offset =0 ; -if (pDM_Odm->RFCalibrateInfo.TxPowerTrackControl == false) +if (!pDM_Odm->RFCalibrateInfo.TxPowerTrackControl)return offset;if ((Rate ==MGN_1M ) || (Rate ==MGN_2M ) || (Rate ==MGN_5_5M ) || (Rate ==MGN_11M ))
drivers/staging/rtl8723bs/hal/hal_intf.c +2 -2
@@ -160,7 +160,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)/* pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; */ /* memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN); */ -if (padapter->securitypriv.binstallBIPkey == true) { +if (padapter->securitypriv.binstallBIPkey) {if (is_multicast_ether_addr (pmgntframe->attrib.ra)) { pmgntframe->attrib.encrypt = _BIP_;/* pmgntframe->attrib.bswenc = true; */
@@ -206,7 +206,7 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) pmlmepriv = &(padapter->mlmepriv); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))add_ratid (padapter, psta, rssi_level);else {UpdateHalRAMask8723B (padapter, psta->mac_id, rssi_level);
drivers/staging/rtl8723bs/hal/odm.c +4 -4
@@ -381,7 +381,7 @@ static void FindMinimumRSSI(struct adapter *padapter)/* 1 1.Determine the minimum RSSI */ if ( - (pDM_Odm->bLinked != true) && + (!pDM_Odm->bLinked) && (pdmpriv->EntryMinUndecoratedSmoothedPWDB ==0 ) ) { pdmpriv->MinUndecoratedPWDBForDM =0 ;
@@ -400,7 +400,7 @@ static void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm)u32 PWDB_rssi[NUM_STA ] = {0 };/* 0~15]:MACID, [16~31]:PWDB_rssi */ struct ra_t *pRA_Table = &pDM_Odm->DM_RA_Table; -if (pDM_Odm->bLinked != true) +if (!pDM_Odm->bLinked)return ; pRA_Table->firstconnect = pDM_Odm->bLinked;
@@ -431,7 +431,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 == true)/* 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 +623,7 @@ void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm) }odm_CCKPacketDetectionThresh (pDM_Odm); -if (*(pDM_Odm->pbPowerSaving) == true) +if (*(pDM_Odm->pbPowerSaving))return ;
drivers/staging/rtl8723bs/hal/odm_CfoTracking.c +1 -1
@@ -138,7 +138,7 @@ void ODM_CfoTracking(void *pDM_VOID) pCfoTrack->CFO_ave_pre = CFO_ave;/* 4 1.4 Dynamic Xtal threshold */ -if (pCfoTrack->bAdjust == false) { +if (!pCfoTrack->bAdjust) {if (CFO_ave >CFO_TH_XTAL_HIGH || CFO_ave < (-CFO_TH_XTAL_HIGH )) pCfoTrack->bAdjust = true; }else {
drivers/staging/rtl8723bs/hal/odm_DIG.c +12 -12
@@ -82,7 +82,7 @@ void odm_NHMBB(void *pDM_VOID)if ((pDM_Odm->NHMCurTxOkcnt) +1 > (u64)(pDM_Odm->NHMCurRxOkcnt<<2 ) +1 ) {/* Tx > 4*Rx possible for adaptivity test */ -if (pDM_Odm->NHM_cnt_0 >=190 || pDM_Odm->adaptivity_flag == true) { +if (pDM_Odm->NHM_cnt_0 >=190 || pDM_Odm->adaptivity_flag) {/* Enable EDCCA since it is possible running Adaptivity testing */ /* test_status = 1; */ pDM_Odm->adaptivity_flag = true;
@@ -99,7 +99,7 @@ void odm_NHMBB(void *pDM_VOID) } } }else {/* TX<RX */ -if (pDM_Odm->adaptivity_flag == true && pDM_Odm->NHM_cnt_0 <=200 ) { +if (pDM_Odm->adaptivity_flag && pDM_Odm->NHM_cnt_0 <=200 ) {/* test_status = 2; */ pDM_Odm->tolerance_cnt =0 ; }else {
@@ -189,7 +189,7 @@ void odm_AdaptivityInit(void *pDM_VOID) {struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; -if (pDM_Odm->Carrier_Sense_enable == false) +if (!pDM_Odm->Carrier_Sense_enable) pDM_Odm->TH_L2H_ini =0xf7 ;/* -7 */ else pDM_Odm->TH_L2H_ini =0xa ;
@@ -232,7 +232,7 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI) pDM_Odm->IGI_target = (u8 ) IGI_target;/* Search pwdB lower bound */ -if (pDM_Odm->TxHangFlg == true) { +if (pDM_Odm->TxHangFlg) {PHY_SetBBReg (pDM_Odm->Adapter,ODM_REG_DBG_RPT_11N , bMaskDWord,0x208 );odm_SearchPwdBLowerBound (pDM_Odm, pDM_Odm->IGI_target); }
@@ -253,9 +253,9 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI)if ( pDM_Odm->bLinked && - pDM_Odm->Carrier_Sense_enable == false && - pDM_Odm->NHM_disable == false && - pDM_Odm->TxHangFlg == false + !pDM_Odm->Carrier_Sense_enable && + !pDM_Odm->NHM_disable && + !pDM_Odm->TxHangFlg )odm_NHMBB (pDM_Odm);
@@ -323,7 +323,7 @@ bool odm_DigAbort(void *pDM_VOID)return true;/* add by Neil Chen to avoid PSD is processing */ -if (pDM_Odm->bDMInitialGainEnable == false) +if (!pDM_Odm->bDMInitialGainEnable)return true;return false;
@@ -387,14 +387,14 @@ void odm_DIG(void *pDM_VOID)if (odm_DigAbort (pDM_Odm))return ; -if (pDM_Odm->adaptivity_flag == true) +if (pDM_Odm->adaptivity_flag) Adap_IGI_Upper = pDM_Odm->Adaptivity_IGI_upper;/* 1 Update status */ DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_0; - FirstConnect = (pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0 == false); - FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0 == true); + FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_0); + FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0);/* 1 Boundary Decision */ /* 2 For WIN\CE */
@@ -529,7 +529,7 @@ void odm_DIG(void *pDM_VOID)/* 1 Force upper bound and lower bound for adaptivity */ if ( pDM_Odm->SupportAbility &ODM_BB_ADAPTIVITY && - pDM_Odm->adaptivity_flag == true + pDM_Odm->adaptivity_flag ) {if (CurrentIGI > Adap_IGI_Upper) CurrentIGI = Adap_IGI_Upper;
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -1
@@ -363,7 +363,7 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode) }if (psmode >0 ) { -if (hal_btcoex_IsBtControlLps (padapter) == true) { +if (hal_btcoex_IsBtControlLps (padapter)) { PowerState =hal_btcoex_RpwmVal (padapter); byte5 =hal_btcoex_LpsVal (padapter);
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +5 -5
@@ -131,21 +131,21 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter) hw_init_completed = Adapter->hw_init_completed; -if (hw_init_completed == false) +if (!hw_init_completed) goto skip_dm; 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 == true) && + (hw_init_completed) && ((!fw_current_in_ps_mode) && bFwPSAwake) ) {rtw_hal_check_rxfifo_full (Adapter); }/* ODM */ -if (hw_init_completed == true) { +if (hw_init_completed) {u8 bLinked = false;u8 bsta_state = false;bool bBtDisabled = true;
@@ -207,7 +207,7 @@ void rtl8723b_HalDmWatchDog_in_LPS(struct adapter *Adapter)struct sta_priv *pstapriv = &Adapter->stapriv;struct sta_info *psta =NULL ; -if (Adapter->hw_init_completed == false) +if (!Adapter->hw_init_completed) goto skip_lps_dm;
@@ -216,7 +216,7 @@ void rtl8723b_HalDmWatchDog_in_LPS(struct adapter *Adapter)ODM_CmnInfoUpdate (&pHalData->odmpriv,ODM_CMNINFO_LINK , bLinked); -if (bLinked == false) +if (!bLinked) goto skip_lps_dm;if (!(pDM_Odm->SupportAbility &ODM_BB_RSSI_MONITOR ))
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +6 -6
@@ -738,7 +738,7 @@ static void hal_ReadEFuse_BT(Hal_GetEfuseDefinition (padapter,EFUSE_BT ,TYPE_AVAILABLE_EFUSE_BYTES_BANK , &total);for (bank =1 ; bank <3 ; bank++) {/* 8723b Max bake 0~2 */ -if (hal_EfuseSwitchToBank (padapter, bank) == false) +if (!hal_EfuseSwitchToBank (padapter, bank)) goto exit; eFuse_Addr =0 ;
@@ -882,7 +882,7 @@ void rtl8723b_InitBeaconParameters(struct adapter *padapter)rtw_write16 (padapter,REG_TBTT_PROHIBIT ,0x6404 );/* ms */ /* Firmware will control REG_DRVERLYINT when power saving is enable, */ /* so don't set this register on STA mode. */ -if (check_fwstate (&padapter->mlmepriv,WIFI_STATION_STATE ) == false) +if (!check_fwstate (&padapter->mlmepriv,WIFI_STATION_STATE ))rtw_write8 (padapter,REG_DRVERLYINT ,DRIVER_EARLY_INT_TIME_8723B );/* 5ms */ rtw_write8 (padapter,REG_BCNDMATIM ,BCN_DMA_ATIME_INT_TIME_8723B );/* 2ms */
@@ -998,7 +998,7 @@ 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 ) == true) { +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 +2118,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 ) == true)) +if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ))) rcr_clear_bit =RCR_CBSSID_BCN ; value_rcr =rtw_read32 (padapter,REG_RCR );
@@ -2185,7 +2185,7 @@ static void hw_var_set_mlme_join(struct adapter *padapter, u8 variable, u8 *val) val32 |=RCR_CBSSID_DATA |RCR_CBSSID_BCN ;rtw_write32 (padapter,REG_RCR , val32); -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) RetryLimit = (pEEPROM->CustomerID ==RT_CID_CCX ) ?7 :48 ;else /* Ad-hoc Mode */ RetryLimit =0x7 ;
@@ -2723,7 +2723,7 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)break ;case HW_VAR_DL_RSVD_PAGE : -if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true) +if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ))rtl8723b_download_BTCoex_AP_mode_rsvd_page (padapter);else rtl8723b_download_rsvd_page (padapter,RT_MEDIA_CONNECT );
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +1 -1
@@ -135,7 +135,7 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe, precvframe->u.hdr.psta =NULL ;if ( pkt_info.bssid_match && - (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true) + (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE )) ) {if (psta) { precvframe->u.hdr.psta = psta;
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +3 -3
@@ -93,7 +93,7 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter) ) goto free_xmitbuf; -if (rtw_sdio_wait_enough_TxOQT_space (padapter, pxmitbuf->agg_num) == false) +if (!rtw_sdio_wait_enough_TxOQT_space (padapter, pxmitbuf->agg_num)) goto free_xmitbuf;traffic_check_for_leave_lps (padapter, true, pxmitbuf->agg_num);
@@ -225,7 +225,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv frame_phead =get_list_head (pframe_queue); -while (list_empty (frame_phead) == false) { +while (!list_empty (frame_phead)) { frame_plist =get_next (frame_phead); pxmitframe = container_of(frame_plist, struct xmit_frame, list);
@@ -269,7 +269,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv }/* ok to send, remove frame from queue */ -if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true) +if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ))if ( (pxmitframe->attrib.psta->state &WIFI_SLEEP_STATE ) && (pxmitframe->attrib.triggered == 0)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -1
@@ -597,7 +597,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter) pwrctrlpriv =adapter_to_pwrctl (padapter);if ( -adapter_to_pwrctl (padapter)->bips_processing == true && +adapter_to_pwrctl (padapter)->bips_processing &&adapter_to_pwrctl (padapter)->pre_ips_type ==0 ) {unsigned long start_time;
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +24 -24
166 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +2 -2
@@ -224,7 +224,7 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)if ((-ESHUTDOWN == *err) || (-ENODEV == *err)) padapter->bSurpriseRemoved = true; -if (rtw_inc_and_chk_continual_io_error (psdiodev) == true) { +if (rtw_inc_and_chk_continual_io_error (psdiodev)) { padapter->bSurpriseRemoved = true;break ; }
@@ -300,7 +300,7 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)if ((-ESHUTDOWN == *err) || (-ENODEV == *err)) padapter->bSurpriseRemoved = true; -if (rtw_inc_and_chk_continual_io_error (psdiodev) == true) { +if (rtw_inc_and_chk_continual_io_error (psdiodev)) { padapter->bSurpriseRemoved = true;break ; }
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +2 -2
@@ -188,13 +188,13 @@ void _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;s32 res =0 ; -if (rtw_if_up (padapter) == false) +if (!rtw_if_up (padapter)) goto drop_packet;rtw_check_xmit_resource (padapter, pkt);if (!rtw_mc2u_disable - &&check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true + &&check_fwstate (pmlmepriv,WIFI_AP_STATE ) && (IP_MCAST_MAC (pkt->data) ||ICMPV6_MCAST_MAC (pkt->data) )
Signature · 1 line
2.53.0
Re: [PATCH v2 1/2] staging: rtl8723bs: simplify boolean comparisons
Quoted 5 lines · Andrei Khomenkov
Simplify boolean comparisons to improve code readability and match the kernel coding style.
Signed-off-by Andrei Khomenkov <[email protected]>---
...
drivers/staging/rtl8723bs/core/rtw_btcoex.c line 16
Quoted 7 lines
void
rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 media_status){drivers/staging/rtl8723bs/core/rtw_btcoex.c +1
-1if ((media_status ==RT_MEDIA_CONNECT ) - && (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true)) { + && (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ))) {rtw_hal_set_hwreg (padapter,HW_VAR_DL_RSVD_PAGE ,NULL ); }
I don't see why you can't remove the parenthesis after simplifying the boolean expression in this patch.
Also, didn't read this entire patch after scanning it for a while, your other patch was doing multiple changes in a single patch as Greg's bot pointed out. Maybe make a series per file the first patch simplifying the boolean expression and then one or two after (depending on if they are different changes) cleaning up the code around them. This would be much easier to review.
Thanks,
ET
Re: [PATCH v2 1/2] staging: rtl8723bs: simplify boolean comparisons
In reply to Andrei Khomenkovdrivers/staging/rtl8723bs/core/rtw_recv.c static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor · line 1948
Quoted 9 lines · Andrei Khomenkov
drivers/staging/rtl8723bs/core/rtw_recv.c +2
-2@@ -1943,8 +1943,8 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor/* indicate this recv_frame */ if (!pattrib->amsdu) { -if ((padapter->bDriverStopped == false) && - (padapter->bSurpriseRemoved == false)) +if ((!padapter->bDriverStopped) && + (!padapter->bSurpriseRemoved))rtw_recv_indicatepkt (padapter, prframe);/* indicate this recv_frame */
I agree with Ethan that you should remove these parentheses.
regards,
dan carpenter
PATCH v2 2/2 staging: rtl8723bs: cleanup code style and parentheses
In reply to Andrei KhomenkovCleanup the driver code to better match the kernel coding style. This patch includes:
- Removal of redundant parentheses in if-statements and expressions.
- Adding missing spaces around bitwise and logical operators.
- Reformatting multi-line conditions for better readability.
- Reformatting long conditions for better readability.
These changes are purely cosmetic and do not alter the driver logic.
--- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 4 +-- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 8 ++--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 +-- drivers/staging/rtl8723bs/core/rtw_recv.c | 34 +++++++++---------- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 23 +++++++------ drivers/staging/rtl8723bs/hal/odm.c | 2 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 16 ++++----- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 5 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 9 ++--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 11 +++--- 14 files changed, 64 insertions(+), 68 deletions(-)
drivers/staging/rtl8723bs/core/rtw_btcoex.c +2 -2
@@ -10,8 +10,8 @@void rtw_btcoex_MediaStatusNotify (struct adapter *padapter,u8 media_status) { -if ((media_status ==RT_MEDIA_CONNECT ) - && (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ))) { +if (media_status ==RT_MEDIA_CONNECT && +check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE )) {rtw_hal_set_hwreg (padapter,HW_VAR_DL_RSVD_PAGE ,NULL ); }
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -347,7 +347,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)/* HT Cap. */ if ((pregistrypriv->wireless_mode &WIRELESS_11_24N ) && - (pregistrypriv->ht_enable)) { + pregistrypriv->ht_enable) {/* todo: */ }
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +4 -4
@@ -153,7 +153,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock; -if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) { +if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE )) {if ((pmlmepriv->assoc_ssid.ssid_length == ssid->ssid_length) && (!memcmp (&pmlmepriv->assoc_ssid.ssid, ssid->ssid, ssid->ssid_length))) {if (!check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {
@@ -298,11 +298,11 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,spin_lock_bh (&pmlmepriv->lock); -if ((check_fwstate (pmlmepriv, _FW_LINKED)) || (*pold_state == Ndis802_11IBSS)) +if (check_fwstate (pmlmepriv, _FW_LINKED) || *pold_state == Ndis802_11IBSS)rtw_disassoc_cmd (padapter,0 , true); -if ((check_fwstate (pmlmepriv, _FW_LINKED)) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) +if (check_fwstate (pmlmepriv, _FW_LINKED) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))rtw_free_assoc_resources (padapter,1 );if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {
drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -3
@@ -1786,9 +1786,9 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme goto exit;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) - ) +if (jiffies_to_msecs (jiffies - competitor->last_scanned) >= + mlme->roam_scanr_exp_ms || + !is_same_ess (&competitor->network, &mlme->cur_network.network)) goto exit; }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -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; }
@@ -1239,7 +1239,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->flags &= ~WLAN_STA_HT ; -if ((!pmlmepriv->htpriv.ht_option) && (pstat->flags &WLAN_STA_HT )) { +if (!pmlmepriv->htpriv.ht_option && (pstat->flags &WLAN_STA_HT )) { status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail; }
drivers/staging/rtl8723bs/core/rtw_recv.c +17 -17
@@ -409,7 +409,8 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *pif (bmic_err) {/* double check key_index for some timing issue , */ /* cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue */ -if ((is_multicast_ether_addr (prxattrib->ra)) && (prxattrib->key_index != pmlmeinfo->key_index)) +if (is_multicast_ether_addr (prxattrib->ra) && + prxattrib->key_index != pmlmeinfo->key_index) brpt_micerror = false;if (prxattrib->bdecrypted && brpt_micerror)
@@ -463,7 +464,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p } } -if ((prxattrib->encrypt >0 ) && ((prxattrib->bdecrypted ==0 ) || (psecuritypriv->sw_decrypt))) { +if (prxattrib->encrypt >0 && (prxattrib->bdecrypted ==0 || psecuritypriv->sw_decrypt)) { psecuritypriv->hw_decrypted = false;switch (prxattrib->encrypt) {
@@ -713,8 +714,8 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *u8 *sta_addr =NULL ;signed int bmcast =is_multicast_ether_addr (pattrib->dst); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_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 )) {
@@ -800,7 +801,7 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *pu8 *myhwaddr =myid (&adapter->eeprompriv);signed int bmcast =is_multicast_ether_addr (pattrib->dst); -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE )) && +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) && (check_fwstate (pmlmepriv, _FW_LINKED) ||check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) ) {
@@ -847,8 +848,8 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p goto exit; } - }else if ((check_fwstate (pmlmepriv,WIFI_MP_STATE )) && - (check_fwstate (pmlmepriv, _FW_LINKED))) { + }else if (check_fwstate (pmlmepriv,WIFI_MP_STATE ) && +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 );
@@ -1590,7 +1591,7 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe) eth_type =ntohs (be_tmp);/* pattrib->ether_type */ pattrib->eth_type = eth_type; -if ((check_fwstate (pmlmepriv,WIFI_MP_STATE ))) { +if (check_fwstate (pmlmepriv,WIFI_MP_STATE )) { ptr += rmv_len; *ptr =0x87 ; *(ptr +1 ) =0x12 ;
@@ -1943,8 +1944,8 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor/* indicate this recv_frame */ if (!pattrib->amsdu) { -if ((!padapter->bDriverStopped) && - (!padapter->bSurpriseRemoved)) +if (!padapter->bDriverStopped && + !padapter->bSurpriseRemoved)rtw_recv_indicatepkt (padapter, prframe);/* indicate this recv_frame */ }else if (pattrib->amsdu ==1 ) {
@@ -1984,8 +1985,8 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *wlanhdr_to_ethhdr (prframe);if (pattrib->qos !=1 ) { -if ((!padapter->bDriverStopped) && - (!padapter->bSurpriseRemoved)) { +if (!padapter->bDriverStopped && + !padapter->bSurpriseRemoved) {rtw_recv_indicatepkt (padapter, prframe);return _SUCCESS;
@@ -2092,8 +2093,8 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frameif (recv_indicatepkt_reorder (padapter, prframe) != _SUCCESS) {/* including perform A-MPDU Rx Ordering Buffer Control */ -if ((!padapter->bDriverStopped) && - (!padapter->bSurpriseRemoved)) { +if (!padapter->bDriverStopped && + !padapter->bSurpriseRemoved) { retval = _FAIL;return retval; }
@@ -2103,7 +2104,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frameif (retval != _SUCCESS)return retval; -if ((!padapter->bDriverStopped) && (!padapter->bSurpriseRemoved)) { +if (!padapter->bDriverStopped && !padapter->bSurpriseRemoved) {/* indicate this recv_frame */ rtw_recv_indicatepkt (padapter, prframe); }else {
@@ -2280,8 +2281,7 @@ static void rtw_signal_stat_timer_hdl(struct timer_list *t) }if (check_fwstate (&adapter->mlmepriv, _FW_UNDER_SURVEY) || - !check_fwstate (&adapter->mlmepriv, _FW_LINKED) - ) { + !check_fwstate (&adapter->mlmepriv, _FW_LINKED)) { goto set_timer; }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -1689,7 +1689,7 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) pmlmeext->bcn_delay_cnt[delay_ms]++;/* pmlmeext->bcn_delay_ratio[delay_ms] = (pmlmeext->bcn_delay_cnt[delay_ms] * 100) /pmlmeext->bcn_cnt; */ /* dump for adaptive_early_32k */ -if (pmlmeext->bcn_cnt >100 && (pmlmeext->adaptive_tsf_done)) { +if (pmlmeext->bcn_cnt >100 && pmlmeext->adaptive_tsf_done) {u8 ratio_20_delay, ratio_80_delay;u8 DrvBcnEarly, DrvBcnTimeOut;
drivers/staging/rtl8723bs/core/rtw_xmit.c +12 -11
@@ -386,8 +386,9 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame * }else {while (true) {/* IOT action */ -if ((pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS ) && (pattrib->ampdu_en) && - (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { +if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_ATHEROS && + pattrib->ampdu_en && + padapter->securitypriv.dot11PrivacyAlgrthm == _AES_) { pattrib->vcs_mode =CTS_TO_SELF ;break ; }
@@ -487,7 +488,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pif (psta->ieee8021x_blocked) { pattrib->encrypt =0 ; -if ((pattrib->ether_type !=0x888e ) && (!check_fwstate (pmlmepriv,WIFI_MP_STATE ))) { +if (pattrib->ether_type !=0x888e && !check_fwstate (pmlmepriv,WIFI_MP_STATE )) { res = _FAIL; goto exit; }
@@ -652,8 +653,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pmemcpy (pattrib->dst, ðerhdr.h_dest,ETH_ALEN );memcpy (pattrib->src, ðerhdr.h_source,ETH_ALEN ); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_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 )) {
@@ -719,7 +720,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (!psta) {/* if we cannot get psta => drop the pkt */ res = _FAIL; goto exit; - } else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) && (!(psta->state & _FW_LINKED))) { + }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) && !(psta->state & _FW_LINKED)) { res = _FAIL; goto exit; }
@@ -901,7 +902,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrSetFrameSubType (fctrl, pattrib->subtype);if (pattrib->subtype &WIFI_DATA_TYPE ) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {/* to_ds = 1, fr_ds = 0; */ {
@@ -915,7 +916,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pqospriv->qos_option) qos_option = true; - }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) { + }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {/* to_ds = 0, fr_ds = 1; */ SetFrDs (fctrl);memcpy (pwlanhdr->addr1, pattrib->dst,ETH_ALEN );
@@ -924,8 +925,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrif (pattrib->qos_en) qos_option = true; - }else if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) { + }else if (check_fwstate (pmlmepriv,WIFI_ADHOC_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 );
@@ -1140,7 +1141,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct frg_inx++; -if (bmcst || (rtw_endofpktfile (&pktfile))) { +if (bmcst ||rtw_endofpktfile (&pktfile)) { pattrib->nr_frags = frg_inx; pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len +
drivers/staging/rtl8723bs/hal/odm.c +1 -1
@@ -623,7 +623,7 @@ void ODM_DMWatchdog(struct dm_odm_t *pDM_Odm) }odm_CCKPacketDetectionThresh (pDM_Odm); -if (*(pDM_Odm->pbPowerSaving)) +if (*pDM_Odm->pbPowerSaving)return ;
drivers/staging/rtl8723bs/hal/odm_DIG.c +6 -10
@@ -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;
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +3 -2
@@ -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 );
drivers/staging/rtl8723bs/hal/sdio_halinit.c +2 -4
@@ -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;
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +5 -4
@@ -898,9 +898,9 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,memcpy (param->sta_addr, mac_addr,ETH_ALEN ); ret =rtw_cfg80211_ap_set_encryption (ndev, param, param_len); - }else if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) - ||check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { - ret =rtw_cfg80211_set_encryption (ndev, param, param_len); + }else if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { + ret =rtw_cfg80211_set_encryption (ndev, param, param_len); } addkey_end:
@@ -1208,7 +1208,8 @@ static int cfg80211_rtw_scan(struct wiphy *wiphyspin_unlock_bh (&pwdev_priv->scan_req_lock);if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) { -if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS | _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) { +if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS | _FW_UNDER_SURVEY | + _FW_UNDER_LINKING)) { need_indicate_scan_done = true; goto check_need_indicate_scan_done; }
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +5 -6
@@ -193,12 +193,11 @@ void _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)rtw_check_xmit_resource (padapter, pkt); -if (!rtw_mc2u_disable - &&check_fwstate (pmlmepriv,WIFI_AP_STATE ) - && (IP_MCAST_MAC (pkt->data) - ||ICMPV6_MCAST_MAC (pkt->data) - ) - && padapter->registrypriv.wifi_spec ==0 ) { +if (!rtw_mc2u_disable && +check_fwstate (pmlmepriv,WIFI_AP_STATE ) && + (IP_MCAST_MAC (pkt->data) || +ICMPV6_MCAST_MAC (pkt->data)) && + padapter->registrypriv.wifi_spec ==0 ) {if (pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME /4 )) { res =rtw_mlcst2unicst (padapter, pkt);if (res)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerRe: [PATCH v2 2/2] staging: rtl8723bs: cleanup code style and parentheses
Quoted 10 lines · Andrei Khomenkov
Cleanup the driver code to better match the kernel coding style. This patch includes:
- Removal of redundant parentheses in if-statements and expressions.
- Adding missing spaces around bitwise and logical operators.
- Reformatting multi-line conditions for better readability.
- Reformatting long conditions for better readability.These changes are purely cosmetic and do not alter the driver logic.
Signed-off-by Andrei Khomenkov <[email protected]>
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.
You are receiving this message because of the following common error(s) as indicated below:
- Your patch did many different things all at once, making it difficult to review. All Linux kernel patches need to only do one thing at a time. If you need to do multiple things (such as clean up all coding style issues in a file/driver), do it in a sequence of patches, each one doing only one thing. This will make it easier to review the patches to ensure that they are correct, and to help alleviate any merge issues that larger patches can cause.
If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.
thanks,
greg k-h's patch email bot
Re: [PATCH v2 2/2] staging: rtl8723bs: cleanup code style and parentheses
In reply to Andrei KhomenkovQuoted 32 lines · Andrei Khomenkov
Cleanup the driver code to better match the kernel coding style. This patch includes:
- Removal of redundant parentheses in if-statements and expressions.
- Adding missing spaces around bitwise and logical operators.
- Reformatting multi-line conditions for better readability.
- Reformatting long conditions for better readability.These changes are purely cosmetic and do not alter the driver logic.
Signed-off-by Andrei Khomenkov <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 4 +-- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 8 ++--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 +-- drivers/staging/rtl8723bs/core/rtw_recv.c | 34 +++++++++---------- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 23 +++++++------ drivers/staging/rtl8723bs/hal/odm.c | 2 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 16 ++++----- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 5 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 9 ++--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 11 +++--- 14 files changed, 64 insertions(+), 68 deletions(-)drivers/staging/rtl8723bs/core/rtw_btcoex.c +0
-0
drivers/staging/rtl8723bs/core/rtw_btcoex.c line 13
Quoted 4 lines
drivers/staging/rtl8723bs/core/rtw_btcoex.c +0
-1@@ -10,8 +10,8 @@void rtw_btcoex_MediaStatusNotify (struct adapter *padapter,u8 media_status) { - if ((media_status == RT_MEDIA_CONNECT)
These parentheses, on the other hand, you should leave because Greg is fine or even prefers parentheses around "(foo == bar)". So when you're converting "(foo == false) ||" to "!foo ||" then drop the parentheses. In that situation the parens were because of the == and then when you remove the == you need to remove the parens as well. But here the == is in the final condition so keep the parens.
drivers/staging/rtl8723bs/core/rtw_btcoex.c line 17
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_btcoex.c +2
-1- && (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE))) { +if (media_status ==RT_MEDIA_CONNECT && +check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE )) {rtw_hal_set_hwreg (padapter,HW_VAR_DL_RSVD_PAGE ,NULL ); }
regards,
dan carpenter
Quoted 35 lines · Andrei Khomenkov
This series of patches cleans up the rtl8723bs driver code to improve readability and better align with the Linux kernel coding style. The first patch simplifies boolean comparisons, while the second one performs general code cleanup.
v2:
- Split the single patch into a two-patch series to separate logical changes, as suggested by Luka Gejak.
- Cleaned up additional boolean comparisons found using 'git grep'.Andrei Khomenkov (2):
staging: rtl8723bs: simplify boolean comparisons
staging: rtl8723bs: cleanup code style and parenthesesdrivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 4 +- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 50 ++++++------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 16 ++--- drivers/staging/rtl8723bs/core/rtw_recv.c | 72 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 37 +++++----- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +-- drivers/staging/rtl8723bs/hal/hal_com.c | 4 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 4 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +- drivers/staging/rtl8723bs/hal/odm.c | 8 +-- .../staging/rtl8723bs/hal/odm_CfoTracking.c | 2 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 32 ++++----- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 10 +--
Quoted 9 lines
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 13 ++-- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 51 ++++++------- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 4 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 ++-- 26 files changed, 194 insertions(+), 198 deletions(-)
Hi Andrei,
Thanks for v2 of the patch series.
These changes correctly simplify the boolean logic across the rtl8723bs driver and bring the code into alignment with the Linux kernel coding style. I have verified that the logic remains functionally identical.
This is a solid cleanup for the staging tree.
So for the patch series:
Best regards,
Luka Gejak
Quoted 35 lines · Andrei Khomenkov
This series of patches cleans up the rtl8723bs driver code to improve readability and better align with the Linux kernel coding style. The first patch simplifies boolean comparisons, while the second one performs general code cleanup.
v2:
- Split the single patch into a two-patch series to separate logical changes, as suggested by Luka Gejak.
- Cleaned up additional boolean comparisons found using 'git grep'.Andrei Khomenkov (2):
staging: rtl8723bs: simplify boolean comparisons
staging: rtl8723bs: cleanup code style and parenthesesdrivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 4 +- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 50 ++++++------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 16 ++--- drivers/staging/rtl8723bs/core/rtw_recv.c | 72 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 37 +++++----- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +-- drivers/staging/rtl8723bs/hal/hal_com.c | 4 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 4 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +- drivers/staging/rtl8723bs/hal/odm.c | 8 +-- .../staging/rtl8723bs/hal/odm_CfoTracking.c | 2 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 32 ++++----- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 10 +--
Quoted 9 lines
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 13 ++-- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 51 ++++++------- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 4 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 ++-- 26 files changed, 194 insertions(+), 198 deletions(-)
Hi Andrei and Greg,
I am retracting my previous Reviewed-by tag.
As Greg pointed out, I reviewed this too hastily. This patch improperly mixes cosmetic style cleanups with functional logic changes regarding the bitwise check_fwstate() evaluations. Furthermore, it introduces a syntax error (unbalanced parentheses) around line 782 in core/rtw_xmit.c that breaks the build.
Andrei, you will need to split this into a proper patch series:
1. Separate the functional bug fixes (the check_fwstate logic) from the pure style cleanups.
2. Group fixes of same kind by directory (e.g. core/, os_dep/) to keep the patches manageable. For example simplify boolean comparisons in core directory.
Apologies for the noise.
Best regards,
Luka Gejak