Commit e7e12d66 authored by Wambui Karuga's avatar Wambui Karuga Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Remove comparisons to booleans in conditionals. 



Remove comparisons to true and false in multiple if statements in
drivers/staging/rtl8723bs/core/rtw_mlme.c
Issues reported by checkpatch.pl as:
CHECK: Using comparison to false is error prone
CHECK: Using comparison to true is error prone

Signed-off-by: default avatarWambui Karuga <wambui.karugax@gmail.com>
Link: https://lore.kernel.org/r/d97eaa803566c15a2658df10cf2ca77acddea7fb.1570712632.git.wambui.karugax@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 92f87db5

drivers/staging/rtl8723bs/core/rtw_mlme.c

+14 −15
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor 
	if (!pnetwork)

		return;



	if (pnetwork->fixed == true)

	if (pnetwork->fixed)

		return;



	if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
@@ -222,7 +222,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network * 
	if (!pnetwork)

		return;



	if (pnetwork->fixed == true)

	if (pnetwork->fixed)

		return;



	/* spin_lock_irqsave(&free_queue->lock, irqL); */
@@ -480,7 +480,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) 


		pwlan = LIST_CONTAINOR(plist, struct wlan_network, list);



		if (pwlan->fixed != true) {

		if (!pwlan->fixed) {

			if (oldest == NULL || time_after(oldest->last_scanned, pwlan->last_scanned))

				oldest = pwlan;

		}
@@ -867,7 +867,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) 


	rtw_set_signal_stat_timer(&adapter->recvpriv);



	if (pmlmepriv->to_join == true) {

	if (pmlmepriv->to_join) {

		if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) {

			if (check_fwstate(pmlmepriv, _FW_LINKED) == false) {

				set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
@@ -1368,7 +1368,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
		if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {

			/* s1. find ptarget_wlan */

			if (check_fwstate(pmlmepriv, _FW_LINKED)) {

				if (the_same_macaddr == true) {

				if (the_same_macaddr) {

					ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);

				} else {

					pcur_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
@@ -1843,7 +1843,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter) 
				goto exit;

			}



			if (pmlmepriv->LinkDetectInfo.bBusyTraffic == true) {

			if (pmlmepriv->LinkDetectInfo.bBusyTraffic) {

				DBG_871X(FUNC_ADPT_FMT" exit BusyTraffic\n", FUNC_ADPT_ARG(padapter));

				goto exit;

			}
@@ -1863,20 +1863,20 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) 
	if (!adapter)

		return;



	if (adapter->hw_init_completed == false)

	if (!adapter->hw_init_completed)

		return;



	if ((adapter->bDriverStopped == true) || (adapter->bSurpriseRemoved == true))

	if (adapter->bDriverStopped || adapter->bSurpriseRemoved)

		return;



	if (adapter->net_closed == true)

	if (adapter->net_closed)

		return;



	if (is_primary_adapter(adapter))

		DBG_871X("IsBtDisabled =%d, IsBtControlLps =%d\n", hal_btcoex_IsBtDisabled(adapter), hal_btcoex_IsBtControlLps(adapter));



	if ((adapter_to_pwrctl(adapter)->bFwCurrentInPSMode == true)

		&& (hal_btcoex_IsBtControlLps(adapter) == false)

	if ((adapter_to_pwrctl(adapter)->bFwCurrentInPSMode)

		&& !(hal_btcoex_IsBtControlLps(adapter))

		) {

		u8 bEnterPS;
@@ -2047,7 +2047,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme 




	/* check bssid, if needed */

	if (mlme->assoc_by_bssid == true) {

	if (mlme->assoc_by_bssid) {

		if (memcmp(competitor->network.MacAddress, mlme->assoc_bssid, ETH_ALEN))

			goto exit;

	}
@@ -2805,7 +2805,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe 
	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	u8 cbw40_enable = 0;





	if (!phtpriv->ht_option)

		return;
@@ -2815,7 +2814,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe 
	DBG_871X("+rtw_update_ht_cap()\n");



	/* maybe needs check if ap supports rx ampdu. */

	if ((phtpriv->ampdu_enable == false) && (pregistrypriv->ampdu_enable == 1)) {

	if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) {

		if (pregistrypriv->wifi_spec == 1) {

			/* remove this part because testbed AP should disable RX AMPDU */

			/* phtpriv->ampdu_enable = false; */
@@ -2955,7 +2954,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr 


	phtpriv = &psta->htpriv;



	if ((phtpriv->ht_option == true) && (phtpriv->ampdu_enable == true)) {

	if (phtpriv->ht_option && phtpriv->ampdu_enable) {

		issued = (phtpriv->agg_enable_bitmap>>priority)&0x1;

		issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE