Staging: rtl8723au: Bool tests don't need comparisons
PATCH v2 1/4 Staging: rtl8723au: Bool tests don't need comparisons
This patch removes comparisons to true/false values on bool variables. Fixed using Coccinelle
Change in v2-
Consider cases with false
--- drivers/staging/rtl8723au/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723au/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 6 +++--- drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 2 +- drivers/staging/rtl8723au/hal/usb_halinit.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723au/core/rtw_ap.c +2 -2
@@ -409,7 +409,7 @@ void add_RATid23a(struct rtw_adapter *padapter, struct sta_info *psta, u8 rssi_l arg |=BIT (7 );/* support entry 2~31 */ -if (shortGIrate == true) +if (shortGIrate) arg |=BIT (5 ); tx_ra_bitmap |= ((raid<<28 )&0xf0000000 );
@@ -424,7 +424,7 @@ void add_RATid23a(struct rtw_adapter *padapter, struct sta_info *psta, u8 rssi_l/* arg[5] = Short GI */ rtl8723a_add_rateatid (padapter, tx_ra_bitmap, arg, rssi_level); -if (shortGIrate == true) +if (shortGIrate) init_rate |=BIT (6 );/* set ra_id, init_rate */
drivers/staging/rtl8723au/core/rtw_mlme_ext.c +2 -2
@@ -4092,7 +4092,7 @@ static void rtw_site_survey(struct rtw_adapter *padapter)/* turn on dynamic functions */ rtl8723a_odm_support_ability_restore (padapter); -if (is_client_associated_to_ap23a (padapter) == true) +if (is_client_associated_to_ap23a (padapter))issue_nulldata23a (padapter,NULL ,0 ,3 ,500 );rtl8723a_mlme_sitesurvey (padapter,0 );
@@ -5195,7 +5195,7 @@ void linked_status_chk23a(struct rtw_adapter *padapter)if (psta) {bool is_p2p_enable = false; -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/rtl8723au/core/rtw_wlan_util.c +1 -1
@@ -231,7 +231,7 @@ static unsigned int ratetbl2rateset(struct rtw_adapter *padapter,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;
drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c +3 -3
@@ -5192,7 +5192,7 @@ static void btdm_NotifyFwScan(struct rtw_adapter *padapter, u8 scanType) {u8 H2C_Parameter[1 ] = {0 }; -if (scanType == true) +if (scanType) H2C_Parameter[0 ] =0x1 ; RTPRINT(FBT, BT_TRACE, ("[BTCoex], Notify FW for wifi scan, write 0x3b = 0x%02x\n",
@@ -9141,7 +9141,7 @@ u8 BTDM_IsWifiConnectionExist(struct rtw_adapter *padapter)if (BTHCI_HsConnectionEstablished (padapter)) bRet = true; -if (check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE ) == true) +if (check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE )) bRet = true;return bRet;
@@ -9945,7 +9945,7 @@ void BTDM_CheckBTIdleChange1Ant(struct rtw_adapter *padapter) }if (!pBtMgnt->ExtConfig.bBTBusy) {RTPRINT (FBT ,BT_TRACE , ("[DM][BT], BT is idle or disable\n" )); -if (check_fwstate (&padapter->mlmepriv,WIFI_UNDER_LINKING |WIFI_SITE_MONITOR ) == true) +if (check_fwstate (&padapter->mlmepriv,WIFI_UNDER_LINKING |WIFI_SITE_MONITOR ))BTDM_SetAntenna (padapter,BTDM_ANT_WIFI ); } }
drivers/staging/rtl8723au/hal/rtl8723au_recv.c +1 -1
@@ -231,7 +231,7 @@ void update_recvframe_phyinfo(struct recv_frame *precvframe, pkt_info.StationID =0xFF ;if (pkt_info.bPacketBeacon) { -if (check_fwstate (&padapter->mlmepriv,WIFI_STATION_STATE ) == true) +if (check_fwstate (&padapter->mlmepriv,WIFI_STATION_STATE )) sa = padapter->mlmepriv.cur_network.network.MacAddress;/* to do Ad-hoc */ }else {
drivers/staging/rtl8723au/hal/usb_halinit.c +1 -1
@@ -1256,7 +1256,7 @@ void rtl8723a_update_ramask(struct rtw_adapter *padapter, arg = mac_id &0x1f ;/* MACID */ arg |=BIT (7 ); -if (shortGIrate == true) +if (shortGIrate) arg |=BIT (5 );DBG_8723A ("update raid entry, mask = 0x%x, arg = 0x%x\n" , mask, arg);
Signature · 1 line
2.1.4
PATCH v2 2/4 Staging: vt6656: Bool tests don't need comparisons
This patch removes comparisons to true/false values on bool variables. Fix made using Coccinelle
Change in v2-
Fixing logical error
--- drivers/staging/vt6656/wcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vt6656/wcmd.c +1 -1
@@ -177,7 +177,7 @@ int vnt_schedule_command(struct vnt_private *priv, enum vnt_cmd command)ADD_ONE_WITH_WRAP_AROUND (priv->cmd_enqueue_idx,CMD_Q_SIZE ); priv->free_cmd_queue--; -if (priv->cmd_running == false) +if (!priv->cmd_running)vnt_cmd_complete (priv);return true;
Signature · 1 line
2.1.4
PATCH v2 3/4 Staging: rtl8712: Bool tests don't need comparisons
In reply to Shraddha BarkeThis patch removes comparisons to true/false values on bool variables. Fix made using Coccinelle
Changes in v2-
More instances covered
--- drivers/staging/rtl8712/rtl871x_ioctl_set.c | 24 ++++----- drivers/staging/rtl8712/rtl871x_mlme.c | 77 ++++++++++++++--------------- 2 files changed, 50 insertions(+), 51 deletions(-)
drivers/staging/rtl8712/rtl871x_ioctl_set.c +12 -12
@@ -136,12 +136,12 @@ u8 r8712_set_802_11_bssid(struct _adapter *padapter, u8 *bssid) }spin_lock_irqsave (&pmlmepriv->lock, irqL);if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | - _FW_UNDER_LINKING) == true) { + _FW_UNDER_LINKING)) { status =check_fwstate (pmlmepriv, _FW_UNDER_LINKING); goto _Abort_Set_BSSID; }if (check_fwstate (pmlmepriv, - _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) { + _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) {if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, bssid,ETH_ALEN )) {if (!check_fwstate (pmlmepriv,WIFI_STATION_STATE ))
@@ -149,7 +149,7 @@ u8 r8712_set_802_11_bssid(struct _adapter *padapter, u8 *bssid)* WIFI_ADHOC_MASTER_STATE */ }else {r8712_disassoc_cmd (padapter); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))r8712_ind_disconnect (padapter);r8712_free_assoc_resources (padapter); if ((check_fwstate(pmlmepriv,
@@ -197,7 +197,7 @@ void r8712_set_802_11_ssid(struct _adapter *padapter,*/ r8712_disassoc_cmd (padapter);if (check_fwstate (pmlmepriv, - _FW_LINKED) == true) + _FW_LINKED))r8712_ind_disconnect (padapter);r8712_free_assoc_resources (padapter); if (check_fwstate(pmlmepriv,
@@ -213,18 +213,18 @@ void r8712_set_802_11_ssid(struct _adapter *padapter, } }else {r8712_disassoc_cmd (padapter); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))r8712_ind_disconnect (padapter);r8712_free_assoc_resources (padapter);if (check_fwstate (pmlmepriv, -WIFI_ADHOC_MASTER_STATE ) == true) { +WIFI_ADHOC_MASTER_STATE )) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); } } } -if (padapter->securitypriv.btkip_countermeasure == true) +if (padapter->securitypriv.btkip_countermeasure) goto _Abort_Set_SSID;if (!validate_ssid (ssid)) goto _Abort_Set_SSID;
@@ -248,13 +248,13 @@ void r8712_set_802_11_infrastructure_mode(struct _adapter *padapter,if (*pold_state != networktype) {spin_lock_irqsave (&pmlmepriv->lock, irqL); -if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) || +if ((check_fwstate (pmlmepriv, _FW_LINKED)) || (*pold_state == Ndis802_11IBSS))r8712_disassoc_cmd (padapter);if (check_fwstate (pmlmepriv, - _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) + _FW_LINKED |WIFI_ADHOC_MASTER_STATE ))r8712_free_assoc_resources (padapter); -if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) || +if ((check_fwstate (pmlmepriv, _FW_LINKED)) || (*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {/* will clr Linked_state before this function,
@@ -291,7 +291,7 @@ u8 r8712_set_802_11_disassociate(struct _adapter *padapter)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;spin_lock_irqsave (&pmlmepriv->lock, irqL); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED)) {r8712_disassoc_cmd (padapter);r8712_ind_disconnect (padapter);r8712_free_assoc_resources (padapter);
@@ -313,7 +313,7 @@ u8 r8712_set_802_11_bssid_list_scan(struct _adapter *padapter)return false;spin_lock_irqsave (&pmlmepriv->lock, irqL);if ((check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)) || - (pmlmepriv->sitesurveyctrl.traffic_busy == true)) { + (pmlmepriv->sitesurveyctrl.traffic_busy)) {/* Scan or linking is in progress, do nothing. */ ret = (u8 )check_fwstate (pmlmepriv, _FW_UNDER_SURVEY); }else {
drivers/staging/rtl8712/rtl871x_mlme.c +38 -39
252 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [PATCH v2 3/4] Staging: rtl8712: Bool tests don't need comparisons
Quoted 8 lines · Shraddha Barke
This patch removes comparisons to true/false values on bool variables. Fix made using Coccinelle
Changes in v2-
More instances coveredSigned-off-by Shraddha Barke <[email protected]>---
You have not even build tested before sending.
Quoted 3 lines
drivers/staging/rtl8712/rtl871x_ioctl_set.c | 24 ++++----- drivers/staging/rtl8712/rtl871x_mlme.c | 77 ++++++++++++++--------------- 2 files changed, 50 insertions(+), 51 deletions(-)
<snip>
drivers/staging/rtl8712/rtl871x_mlme.c int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) · line 1135
Quoted 11 lines
drivers/staging/rtl8712/rtl871x_mlme.c +3
-3@@ -1131,9 +1130,9 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) phead = &queue->queue; pmlmepriv->pscanned = phead->next;while (1 ) { -if (end_of_queue_search (phead, pmlmepriv->pscanned) == true) { -if ((pmlmepriv->assoc_by_rssi == true) && - (pnetwork_max_rssi !=NULL )) { +if (end_of_queue_search (phead, pmlmepriv->pscanned)) { +if ((pmlmepriv->assoc_by_rssi) && + (pnetwork_max_rssi))
Coccinelle will not remove the opening brace.
And in one part of the patch one test for !=NULL was modified.
regards
sudip
PATCH v2 4/4 Staging: rtl8188eu: Bool tests don't need comparisons
In reply to Shraddha BarkeThis patch removes comparisons to true/false values on bool variables. Fix made using Coccinelle
Changes in v2-
Included more instances of true and false
--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 ++++++------ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +6 -6
@@ -272,7 +272,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_SCAN ,1 ); ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_ATOMIC );
@@ -903,7 +903,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) pmlmepriv = &(padapter->mlmepriv);#ifdef CONFIG_88EU_AP_MODE -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))expire_timeout_chk (padapter);#endif
@@ -920,13 +920,13 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)u8 mstatus; -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 )))return ;switch (lps_ctrl_type) {case LPS_CTRL_SCAN : -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED)) {/* connect */ LPS_Leave (padapter); }
@@ -1384,7 +1384,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *spin_lock_bh (&pmlmepriv->lock); -if ((check_fwstate (pmlmepriv,WIFI_MP_STATE ) == true) && (check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true)) +if ((check_fwstate (pmlmepriv,WIFI_MP_STATE )) && (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)))_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING);set_fwstate (pmlmepriv, _FW_LINKED);
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +13 -13
@@ -89,7 +89,7 @@ u8 rtw_do_join(struct adapter *padapter)mod_timer (&pmlmepriv->assoc_timer, jiffies +msecs_to_jiffies (MAX_JOIN_TIMEOUT )); }else { -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {/* submit createbss_cmd to change to a ADHOC_MASTER */ /* pmlmepriv->lock has been acquired by caller... */
@@ -162,7 +162,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)DBG_88E ("Set BSSID under fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv)); -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) goto handle_tkip_countermeasure;else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock;
@@ -171,7 +171,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n" ));if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, bssid,ETH_ALEN )) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false) +if (!check_fwstate (pmlmepriv,WIFI_STATION_STATE )) goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */ }else {RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set BSSID not the same bssid\n" ));
@@ -180,12 +180,12 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)rtw_disassoc_cmd (padapter,0 , true); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);rtw_free_assoc_resources (padapter); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { +if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); }
@@ -248,9 +248,9 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)spin_lock_bh (&pmlmepriv->lock);DBG_88E ("Set SSID under fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv)); -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) goto handle_tkip_countermeasure; -else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) +else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock;if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) {
@@ -268,12 +268,12 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */ rtw_disassoc_cmd (padapter,0 , true); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);rtw_free_assoc_resources (padapter); -if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); }
@@ -290,12 +290,12 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)rtw_disassoc_cmd (padapter,0 , true); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);rtw_free_assoc_resources (padapter); -if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); }
@@ -319,7 +319,7 @@ handle_tkip_countermeasure:memcpy (&pmlmepriv->assoc_ssid, ssid,sizeof (struct ndis_802_11_ssid )); pmlmepriv->assoc_by_bssid = false; -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) pmlmepriv->to_join = true;else status =rtw_do_join (padapter);
@@ -369,7 +369,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,rtw_free_assoc_resources (padapter);if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) { -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ }
Signature · 1 line
2.1.4