staging: rtl8723bs: remove unnecessary boolean comparisons
PATCH v3 1/1 staging: rtl8723bs: remove unnecessary boolean comparisons
Remove explicit comparisons to true/false in boolean expressions to improve code readability and follow standard Linux kernel coding style.
Signed-off-by Michael Huang <[email protected]>
---
v3:
- Reduced the series to a single patch.
- Dropped the redundant "else" statement cleanup as it was already merged into staging-next (commit 09a9c4bde41c).
- Rebased on top of the latest staging-next branch.
- Fixed minor alignment and line length issues in modified lines to comply with checkpatch.pl.
v2:
- Split the cleanup into two patches (boolean comparisons and redundant else statements).
- Improved indentation and added proper sign-offs.
v1:
- Initial version with combined cleanups.
drivers/staging/rtl8723bs/core/rtw_mlme.c | 42 +++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +21 -21
@@ -179,8 +179,8 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetworif (pnetwork->fixed)return ; -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) lifetime =1 ;if (!isfreeall) {
@@ -267,7 +267,7 @@ signed int rtw_if_up(struct adapter *padapter)signed int res;if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - (check_fwstate (&padapter->mlmepriv, _FW_LINKED) == false)) + !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) res = false;else res = true;
@@ -469,7 +469,7 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network); -if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +if (check_fwstate (pmlmepriv, _FW_LINKED) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) {update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true);rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fix_ie ), pmlmepriv->cur_network.network.ie_length);
@@ -633,7 +633,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetworif ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy ==0 )) bselected = false; -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {if (pnetwork->network.infrastructure_mode != pmlmepriv->cur_network.network.infrastructure_mode) bselected = false; }
@@ -661,7 +661,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->lock);/* update IBSS_network 's timestamp */ -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {if (!memcmp (&pmlmepriv->cur_network.network.mac_address, pnetwork->mac_address,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;
@@ -678,7 +678,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) }/* lock pmlmepriv->lock when you accessing network_q */ -if ((check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) == false) { +if (!check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) {if (pnetwork->ssid.ssid[0 ] ==0 ) pnetwork->ssid.ssid_length =0 ;rtw_add_network (adapter, pnetwork);
@@ -710,8 +710,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_set_signal_stat_timer (&adapter->recvpriv);if (pmlmepriv->to_join) { -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) { -if (check_fwstate (pmlmepriv, _FW_LINKED) == false) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { +if (!check_fwstate (pmlmepriv, _FW_LINKED)) {set_fwstate (pmlmepriv, _FW_UNDER_LINKING);if (rtw_select_and_join_from_scanned_queue (pmlmepriv) == _SUCCESS) {
@@ -1206,7 +1206,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)rtw_free_stainfo (adapter, pcur_sta); ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->network.mac_address); -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (ptarget_wlan) ptarget_wlan->fixed = true; }
@@ -1214,7 +1214,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) }else { ptarget_wlan =_rtw_find_same_network (&pmlmepriv->scanned_queue, pnetwork); -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (ptarget_wlan) ptarget_wlan->fixed = true; }
@@ -1231,7 +1231,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) }/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork);if (!ptarget_sta) {spin_unlock_bh (&pmlmepriv->scanned_queue.lock);
@@ -1240,7 +1240,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) }/* s4. indicate connect */ -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { pmlmepriv->cur_network_scanned = ptarget_wlan;rtw_indicate_connect (adapter); }
@@ -1258,7 +1258,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)rtw_reset_securitypriv (adapter);_set_timer (&pmlmepriv->assoc_timer,1 ); -if ((check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING))_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING); }else {/* if join_res < 0 (join fails), then try again */
@@ -1386,8 +1386,8 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->lock); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {if (adapter->stapriv.asoc_sta_count ==2 ) {spin_lock_bh (&pmlmepriv->scanned_queue.lock); ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address);
@@ -1624,7 +1624,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter)if (pmlmepriv->auto_scan_int_ms !=0 &&jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {if (!padapter->registrypriv.wifi_spec) { -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto exit;if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
@@ -1866,7 +1866,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) candidate_exist:/* check for situation of _FW_LINKED */ -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED)) {rtw_disassoc_cmd (adapter,0 , true);rtw_indicate_disconnect (adapter);rtw_free_assoc_resources (adapter,0 );
@@ -2607,12 +2607,12 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)signed int rtw_linked_check (struct adapter *padapter) { -if ((check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true) || - (check_fwstate (&padapter->mlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE ) == true)) { +if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) || +check_fwstate (&padapter->mlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE )) {if (padapter->stapriv.asoc_sta_count >2 )return true; }else {/* Station mode */ -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) == true) +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED))return true; }return false;
Signature · 1 line
2.43.0