staging: rtl8188eu: fixed 'braces are not necessary for single statement blocks'. (8bfea034) · Commits · 戴 / test

drivers/staging/rtl8188eu/core/rtw_efuse.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -563,9 +563,9 @@ static bool hal_EfusePgPacketWrite2ByteHeader(struct adapter *pAdapter, u8 efuse
		}

		if ((tmp_header & 0x0F) == 0x0F) { /* word_en PG fail */
		if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) {
		if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_)
		return false;
		}

		efuse_addr++;
		continue;
		} else if (pg_header != tmp_header) { /* offset PG fail */

+5 −9

Original line number	Diff line number	Diff line
		@@ -275,9 +275,8 @@ static s32 dump_mgntframe_and_wait_ack(struct adapter *padapter,
		pxmitpriv->ack_tx = true;

		pmgntframe->ack_report = 1;
		if (rtw_hal_mgnt_xmit(padapter, pmgntframe) == _SUCCESS) {
		if (rtw_hal_mgnt_xmit(padapter, pmgntframe) == _SUCCESS)
		ret = rtw_ack_tx_wait(pxmitpriv, timeout_ms);
		}

		pxmitpriv->ack_tx = false;
		mutex_unlock(&pxmitpriv->ack_tx_mutex);
		@@ -3460,11 +3459,10 @@ static unsigned int OnAssocRsp(struct adapter *padapter,
		UpdateBrateTbl(padapter, pmlmeinfo->network.SupportedRates);

		report_assoc_result:
		if (res > 0) {
		if (res > 0)
		rtw_buf_update(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len, pframe, pkt_len);
		} else {
		else
		rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len);
		}

		report_join_res(padapter, res);

		@@ -4009,9 +4007,8 @@ static void init_channel_list(struct adapter padapter, struct rt_channel_info
		struct p2p_reg_class *reg = NULL;

		for (ch = o->min_chan; ch <= o->max_chan; ch += o->inc) {
		if (!has_channel(channel_set, chanset_size, ch)) {
		if (!has_channel(channel_set, chanset_size, ch))
		continue;
		}

		if ((0 == padapter->registrypriv.ht_enable) && (8 == o->inc))
		continue;
		@@ -4754,10 +4751,9 @@ void linked_status_chk(struct adapter *padapter)
		}
		}

		if (tx_chk != _SUCCESS && pmlmeinfo->link_count++ == 0xf) {
		if (tx_chk != _SUCCESS && pmlmeinfo->link_count++ == 0xf)
		tx_chk = issue_nulldata(padapter, NULL, 0, 1, 0);
		}
		}

		if (rx_chk == _FAIL) {
		pmlmeext->retry++;

+2 −2

Original line number	Diff line number	Diff line
		@@ -180,9 +180,9 @@ int ips_leave(struct adapter *padapter)
		DBG_88E("==>ips_leave cnts:%d\n", pwrpriv->ips_leave_cnts);

		result = rtw_ips_pwr_up(padapter);
		if (result == _SUCCESS) {
		if (result == _SUCCESS)
		pwrpriv->rf_pwrstate = rf_on;
		}

		DBG_88E_LEVEL(_drv_info_, "nolinked power save leave\n");

		if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) \|\| (_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm)) {

+4 −5

Original line number	Diff line number	Diff line
		@@ -1093,11 +1093,10 @@ static int validate_recv_data_frame(struct adapter *adapter,
		break;
		}

		if (ret == _FAIL) {
		if (ret == _FAIL)
		goto exit;
		} else if (ret == RTW_RX_HANDLED) {
		else if (ret == RTW_RX_HANDLED)
		goto exit;
		}

		if (psta == NULL) {
		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" after to_fr_ds_chk; psta==NULL\n"));
		@@ -1573,9 +1572,9 @@ static int amsdu_to_msdu(struct adapter padapter, struct recv_frame prframe)
		if (padding_len == 4)
		padding_len = 0;

		if (a_len < padding_len) {
		if (a_len < padding_len)
		goto exit;
		}

		pdata += padding_len;
		a_len -= padding_len;
		}