Commit 709c8e49 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove unnecessary bracks on DBG_871X removal sites

parent b4f27a06
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -274,11 +274,10 @@ void expire_timeout_chk(struct adapter *padapter)
				&& padapter->xmitpriv.free_xmitframe_cnt < ((
					NR_XMITFRAME / pstapriv->asoc_list_cnt
				) / 2)
			) {
			)
				wakeup_sta_to_xmit(padapter, psta);
		}
	}
	}

	spin_unlock_bh(&pstapriv->asoc_list_lock);

@@ -536,15 +535,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)

		/*  B0 Config LDPC Coding Capability */
		if (TEST_FLAG(phtpriv_ap->ldpc_cap, LDPC_HT_ENABLE_TX) &&
			      GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)(&phtpriv_sta->ht_cap))) {
			      GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)(&phtpriv_sta->ht_cap)))
			SET_FLAG(cur_ldpc_cap, (LDPC_HT_ENABLE_TX | LDPC_HT_CAP_TX));
		}

		/*  B7 B8 B9 Config STBC setting */
		if (TEST_FLAG(phtpriv_ap->stbc_cap, STBC_HT_ENABLE_TX) &&
			      GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)(&phtpriv_sta->ht_cap))) {
			      GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)(&phtpriv_sta->ht_cap)))
			SET_FLAG(cur_stbc_cap, (STBC_HT_ENABLE_TX | STBC_HT_CAP_TX));
		}
	} else {
		phtpriv_sta->ampdu_enable = false;

+2 −4
Original line number Diff line number Diff line
@@ -21,13 +21,11 @@ void rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 mediaStatus)

void rtw_btcoex_HaltNotify(struct adapter *padapter)
{
	if (!padapter->bup) {
	if (!padapter->bup)
		return;
	}

	if (padapter->bSurpriseRemoved) {
	if (padapter->bSurpriseRemoved)
		return;
	}

	hal_btcoex_HaltNotify(padapter);
}
+4 −6
Original line number Diff line number Diff line
@@ -313,9 +313,9 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)

	if ((pcmdpriv->padapter->hw_init_completed == false && bAllow == false)
		|| atomic_read(&(pcmdpriv->cmdthd_running)) == false	/* com_thread not running */
	) {
	)
		return _FAIL;
	}

	return _SUCCESS;
}

@@ -419,9 +419,8 @@ int rtw_cmd_thread(void *context)
			break;
		}

		if (list_empty(&(pcmdpriv->cmd_queue.queue))) {
		if (list_empty(&(pcmdpriv->cmd_queue.queue)))
			continue;
		}

		if (rtw_register_cmd_alive(padapter) != _SUCCESS)
			continue;
@@ -1508,9 +1507,8 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)

	mutex_lock(&pwrpriv->lock);

	if (pwrpriv->dtim != dtim) {
	if (pwrpriv->dtim != dtim)
		pwrpriv->dtim = dtim;
	}

	if ((pwrpriv->bFwCurrentInPSMode == true) && (pwrpriv->pwr_mode > PS_MODE_ACTIVE)) {
		u8 ps_mode = pwrpriv->pwr_mode;
+4 −6
Original line number Diff line number Diff line
@@ -818,9 +818,8 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
	/* first 3 bytes in vendor specific information element are the IEEE
	 * OUI of the vendor. The following byte is used a vendor specific
	 * sub-type. */
	if (elen < 4) {
	if (elen < 4)
		return -1;
	}

	oui = get_unaligned_be24(pos);
	switch (oui) {
@@ -835,9 +834,9 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
			elems->wpa_ie_len = elen;
			break;
		case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
			if (elen < 5) {
			if (elen < 5)
				return -1;
			}

			switch (pos[4]) {
			case WME_OUI_SUBTYPE_INFORMATION_ELEMENT:
			case WME_OUI_SUBTYPE_PARAMETER_ELEMENT:
@@ -905,9 +904,8 @@ enum ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
		elen = *pos++;
		left -= 2;

		if (elen > left) {
		if (elen > left)
			return ParseFailed;
		}

		switch (id) {
		case WLAN_EID_SSID:
+1 −2
Original line number Diff line number Diff line
@@ -172,9 +172,8 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)
{
	int ret = false;
	int value = atomic_inc_return(&dvobj->continual_io_error);
	if (value > MAX_CONTINUAL_IO_ERR) {
	if (value > MAX_CONTINUAL_IO_ERR)
		ret = true;
	}

	return ret;
}
Loading