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

staging: rtl8723bs: remove empty if, else blocks after RT_TRACE deletion 



Remove all if, else if, else blocks left empty 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/0ce82ac515ba5f6b6318e63d910ad61d7a61de35.1617640221.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+0 −15
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize) 
	blockCount_p1 = buffSize / blockSize_p1;

	remainSize_p1 = buffSize % blockSize_p1;



	if (blockCount_p1) {

	}



	for (i = 0; i < blockCount_p1; i++) {

		ret = rtw_write32(padapter, (FW_8723B_START_ADDRESS + i * blockSize_p1), *((u32 *)(bufferPtr + i * blockSize_p1)));

		if (ret == _FAIL) {
@@ -81,10 +78,6 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize) 


		blockCount_p2 = remainSize_p1/blockSize_p2;

		remainSize_p2 = remainSize_p1%blockSize_p2;



		if (blockCount_p2) {

		}



	}



	/* 3 Phase #3 */
@@ -2266,8 +2259,6 @@ static bool Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup) 
			*pGroup = 3;

		else if (12 <= Channel && Channel <= 14)

			*pGroup = 4;

		else {

		}

	} else {

		bIn24G = false;
@@ -2299,9 +2290,6 @@ static bool Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup) 
			*pGroup = 12;

		else if (173  <= Channel && Channel <= 177)

			*pGroup = 13;

		else {

		}



	}

	return bIn24G;

}
@@ -3022,7 +3010,6 @@ static void rtl8723b_fill_default_txdesc( 
			ptxdesc->spe_rpt = 1;

			ptxdesc->sw_define = (u8)(GET_PRIMARY_ADAPTER(padapter)->xmitpriv.seq_no);

		}

	} else if (pxmitframe->frame_tag == TXAGG_FRAMETAG) {

	} else {

		ptxdesc->macid = pattrib->mac_id; /*  CAM_ID(MAC_ID) */

		ptxdesc->rate_id = pattrib->raid; /*  Rate ID */
@@ -4258,8 +4245,6 @@ void rtl8723b_start_thread(struct adapter *padapter) 
	struct xmit_priv *xmitpriv = &padapter->xmitpriv;



	xmitpriv->SdioXmitThread = kthread_run(rtl8723bs_xmit_thread, padapter, "RTWHALXT");

	if (IS_ERR(xmitpriv->SdioXmitThread)) {

	}

}



void rtl8723b_stop_thread(struct adapter *padapter)

drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c

+0 −7
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ void PHY_SetTxPowerIndex( 
			DBG_871X("Invalid Rate!!\n");

			break;

		}

	} else {

	}

}
@@ -648,8 +647,6 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter) 
			SCSettingOf40 = VHT_DATA_SC_40_LOWER_OF_80MHZ;

		else if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)

			SCSettingOf40 = VHT_DATA_SC_40_UPPER_OF_80MHZ;

		else

			{}



		if (

			(pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) &&
@@ -671,15 +668,11 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter) 
			(pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)

		)

			SCSettingOf20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ;

		else

			{}

	} else if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {

		if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)

			SCSettingOf20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;

		else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)

			SCSettingOf20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;

		else

			{}

	}



	return  (SCSettingOf40 << 4) | SCSettingOf20;

drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c

+1 −2
Original line number Diff line number Diff line
@@ -345,8 +345,7 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t) 
					if (pattrib->physt)

						update_recvframe_phyinfo(precvframe, (struct phy_stat *)ptr);



					if (rtw_recv_entry(precvframe) != _SUCCESS) {

					}

					rtw_recv_entry(precvframe);

				} else if (pattrib->pkt_rpt_type == C2H_PACKET) {

					struct c2h_evt_hdr_t	C2hEvent;

drivers/staging/rtl8723bs/hal/sdio_ops.c

+0 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,6 @@ void sd_int_hdl(struct adapter *adapter) 
			SdioLocalCmd52Write4Byte(adapter, SDIO_REG_HISR, v32);



		sd_int_dpc(adapter);

	} else {

	}

}