Staging: rtl8723au: Bool tests don't need comparisons
PATCH 1/4 Staging: rtl8723au: Bool tests don't need comparisons
This patch removes comparisons to true/false values on bool variables. Fixed using Coccinelle
--- drivers/staging/rtl8723au/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723au/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 4 +++--- drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 2 +- drivers/staging/rtl8723au/hal/usb_halinit.c | 2 +- 6 files changed, 9 insertions(+), 9 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 +1 -1
@@ -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 );
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 +2 -2
@@ -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;
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 2/4 Staging: rtl8188eu: Bool tests don't need comparisons
This patch removes comparisons to true/false values on bool variables. Fix made using Coccinelle
--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 6 ++++---- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +2 -2
@@ -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
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +3 -3
@@ -180,7 +180,7 @@ 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);
@@ -290,7 +290,7 @@ 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);
@@ -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 */ }
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -1028,7 +1028,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, pxmitframe->attrib.triggered =1 ;spin_unlock_bh (&psta->sleep_q.lock); -if (rtw_hal_xmit (padapter, pxmitframe) == true) +if (rtw_hal_xmit (padapter, pxmitframe))rtw_os_xmit_complete (padapter, pxmitframe);spin_lock_bh (&psta->sleep_q.lock);
@@ -1925,7 +1925,7 @@ void rtw_reordering_ctrl_timeout_handler(unsigned long data)spin_lock_bh (&ppending_recvframe_queue->lock); -if (recv_indicatepkts_in_order (padapter, preorder_ctrl, true) == true) +if (recv_indicatepkts_in_order (padapter, preorder_ctrl, true))mod_timer (&preorder_ctrl->reordering_ctrl_timer, jiffies +msecs_to_jiffies (REORDER_WAIT_TIME ));
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1 -1
@@ -203,7 +203,7 @@ static unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *ratdefault : 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/rtl8188eu/core/rtw_xmit.c +1 -1
@@ -2111,7 +2111,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst pxmitframe->attrib.triggered =1 ; -if (rtw_hal_xmit (padapter, pxmitframe) == true) +if (rtw_hal_xmit (padapter, pxmitframe))rtw_os_xmit_complete (padapter, pxmitframe);if ((psta->sleepq_ac_len ==0 ) && (!psta->has_legacy_ac) && (wmmps_ac)) {
Signature · 1 line
2.1.4
PATCH 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
--- drivers/staging/rtl8712/rtl871x_ioctl_set.c | 4 ++++------ drivers/staging/rtl8712/rtl871x_mlme.c | 3 +-- drivers/staging/rtl8712/rtl871x_recv.c | 4 ++-- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-)
drivers/staging/rtl8712/rtl871x_ioctl_set.c +2 -2
@@ -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,
@@ -213,7 +212,7 @@ 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,
drivers/staging/rtl8712/rtl871x_mlme.c +1 -2
@@ -897,8 +897,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)update_ht_cap (adapter, cur_network->network.IEs, cur_network->network.IELength);/*indicate connect*/ -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) - == true) +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ))r8712_indicate_connect (adapter);del_timer (&pmlmepriv->assoc_timer); }else
drivers/staging/rtl8712/rtl871x_recv.c +2 -2
@@ -198,7 +198,7 @@ sint r8712_recvframe_chkmic(struct _adapter *adapter, bmic_err = true; }if (bmic_err == true) { -if (prxattrib->bdecrypted == true) +if (prxattrib->bdecrypted)r8712_handle_tkip_mic_err (adapter, (u8 )IS_MCAST (prxattrib->ra)); res = _FAIL;
@@ -369,7 +369,7 @@ static sint sta2sta_data_frame(struct _adapter *adapter,else *psta =r8712_get_stainfo (pstapriv, sta_addr);/* get ap_info */ if (*psta ==NULL ) { -if (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_MP_STATE )) adapter->mppriv.rx_pktloss++;return _FAIL; }
drivers/staging/rtl8712/rtl871x_xmit.c +1 -1
@@ -337,7 +337,7 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt, pattrib->bswenc = false;/* if in MP_STATE, update pkt_attrib from mp_txcmd, and overwrite * some settings above.*/ -if (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_MP_STATE )) pattrib->priority = (txdesc.txdw1 >>QSEL_SHT ) &0x1f ;return _SUCCESS; }
drivers/staging/rtl8712/usb_intf.c +1 -1
@@ -611,7 +611,7 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)release_firmware (padapter->fw);/* never exit with a firmware callback pending */ wait_for_completion (&padapter->rtl8712_fw_ready); -if (drvpriv.drv_registered == true) +if (drvpriv.drv_registered) padapter->bSurpriseRemoved = true;unregister_netdev (pnetdev);/* will call netdev_close() */ flush_scheduled_work ();
Signature · 1 line
2.1.4
PATCH 4/4 Staging: vt6656: 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
--- 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
Re: [PATCH 4/4] Staging: vt6656: Bool tests don't need comparisons
Quoted 13 lines · Shraddha Barke
This patch removes comparisons to true/false values on bool variables. Fix made using Coccinelle
Signed-off-by Shraddha Barke <[email protected]>--- drivers/staging/vt6656/wcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/vt6656/wcmd.c +0
-0
drivers/staging/vt6656/wcmd.c int vnt_schedule_command(struct vnt_private *priv, enum vnt_cmd command) · line 180
Quoted 5 lines
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)
You turned it into a test for true. It seems strange that this would happen if you used a rule.
julia
Quoted 7 lines
drivers/staging/vt6656/wcmd.c +0
-0vnt_cmd_complete (priv);return true;Signature · 1 line
2.1.4
Quoted 2 lines · Shraddha Barke
This patch removes comparisons to true/false values on bool variables. Fixed using Coccinelle
Please do the "== false" and "!= false" cases at the same time or in another patch.
drivers/staging/rtl8723au/core/rtw_ap.c
Quoted 1 line
drivers/staging/rtl8723au/core/rtw_ap.c +0
-0
[]
Quoted 9 lines
drivers/staging/rtl8723au/core/rtw_ap.c +1
-1@@ -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 );