Commit 0b0029ed authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove unnecessary bracks after RT_TRACE deletion 



Remove all unnecessary bracks in if blocks, after RT_TRACE macro
deletion

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/19fda6f0a2b381399623f5a5def39b07be0d995f.1617640221.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+1 −2
Original line number Diff line number Diff line
@@ -3937,9 +3937,8 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val) 
		{

			u32 usNavUpper = *((u32 *)val);



			if (usNavUpper > HAL_NAV_UPPER_UNIT_8723B * 0xFF) {

			if (usNavUpper > HAL_NAV_UPPER_UNIT_8723B * 0xFF)

				break;

			}



			usNavUpper = DIV_ROUND_UP(usNavUpper,

						  HAL_NAV_UPPER_UNIT_8723B);

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c

+3 −6
Original line number Diff line number Diff line
@@ -101,9 +101,8 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter) 
	if (

		(padapter->bSurpriseRemoved) ||

		(padapter->bDriverStopped)

	) {

	)

		goto free_xmitbuf;

	}



	if (rtw_sdio_wait_enough_TxOQT_space(padapter, pxmitbuf->agg_num) == false)

		goto free_xmitbuf;
@@ -145,9 +144,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter) 
	}



	ret = (padapter->bDriverStopped) || (padapter->bSurpriseRemoved);

	if (ret) {

	if (ret)

		return _FAIL;

	}



	queue_pending = check_pending_xmitbuf(pxmitpriv);
@@ -406,9 +404,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter) 
	if (

		(padapter->bDriverStopped) ||

		(padapter->bSurpriseRemoved)

	) {

	)

		return _FAIL;

	}



	spin_lock_bh(&pxmitpriv->lock);

	ret = rtw_txframes_pending(padapter);

drivers/staging/rtl8723bs/hal/sdio_halinit.c

+5 −10
Original line number Diff line number Diff line
@@ -56,9 +56,8 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter) 


	/*  only cmd52 can be used before power on(card enable) */

	ret = CardEnable(padapter);

	if (!ret) {

	if (!ret)

		return _FAIL;

	}



	/*  Radio-Off Pin Trigger */

	value8 = rtw_read8(padapter, REG_GPIO_INTM + 1);
@@ -674,9 +673,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter) 
/* 	rtw_hal_disable_interrupt(padapter); */



	ret = _InitPowerOn_8723BS(padapter);

	if (_FAIL == ret) {

	if (_FAIL == ret)

		return _FAIL;

	}



	rtw_write8(padapter, REG_EARLY_MODE_CONTROL, 0);
@@ -710,18 +708,16 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter) 


#if (HAL_MAC_ENABLE == 1)

	ret = PHY_MACConfig8723B(padapter);

	if (ret != _SUCCESS) {

	if (ret != _SUCCESS)

		return ret;

	}

#endif

	/*  */

	/* d. Initialize BB related configurations. */

	/*  */

#if (HAL_BB_ENABLE == 1)

	ret = PHY_BBConfig8723B(padapter);

	if (ret != _SUCCESS) {

	if (ret != _SUCCESS)

		return ret;

	}

#endif



	/*  If RF is on, we need to init RF. Otherwise, skip the procedure. */
@@ -730,9 +726,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter) 
	{

#if (HAL_RF_ENABLE == 1)

		ret = PHY_RFConfig8723B(padapter);

		if (ret != _SUCCESS) {

		if (ret != _SUCCESS)

			return ret;

		}

#endif

	}

drivers/staging/rtl8723bs/hal/sdio_ops.c

+1 −2
Original line number Diff line number Diff line
@@ -873,9 +873,8 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size) 
	/* 3 3. read data from rxfifo */

	readbuf = recvbuf->pskb->data;

	ret = sdio_read_port(&adapter->iopriv.intf, WLAN_RX0FF_DEVICE_ID, readsize, readbuf);

	if (ret == _FAIL) {

	if (ret == _FAIL)

		return NULL;

	}



	/* 3 4. init recvbuf */

	recvbuf->len = size;

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+4 −6
Original line number Diff line number Diff line
@@ -439,9 +439,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, 
			wep_key_len = wep_key_len <= 5 ? 5 : 13;

			wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);

			pwep = kzalloc(wep_total_len, GFP_KERNEL);

			if (pwep == NULL) {

			if (pwep == NULL)

				goto exit;

			}



			pwep->KeyLength = wep_key_len;

			pwep->Length = wep_total_len;
@@ -1488,9 +1487,8 @@ static int rtw_wx_set_essid(struct net_device *dev, 
		pmlmepriv->pscanned = get_next(phead);



		while (1) {

			if (phead == pmlmepriv->pscanned) {

			if (phead == pmlmepriv->pscanned)

				break;

			}



			pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);
@@ -1635,9 +1633,9 @@ static int rtw_wx_set_rate(struct net_device *dev, 
		}

	}



	if (rtw_setdatarate_cmd(padapter, datarates) != _SUCCESS) {

	if (rtw_setdatarate_cmd(padapter, datarates) != _SUCCESS)

		ret = -1;

	}



	return ret;

}