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

staging: rtl8723bs: remove all RT_TRACE logs in hal/ and os_dep/ 



Remove all of the RT_TRACE logs in hal/ and os_dep/ files as they
currently do nothing as they require the code to be modified by
hand in order to be turned on. This obviously has not happened
since the code was merged. Moreover it relies on an unneeded
private log level tracing which overrides the in-kernel public one,
so just remove them as they are unused.

This bulk remove has been done with the following semantic
patch:

@@
expression a, b, c;
@@

-	RT_TRACE(a, b, (c));

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


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

drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c

+0 −46
Original line number Diff line number Diff line
@@ -53,22 +53,6 @@ u8 HalPwrSeqCmdParsing( 
	do {

		PwrCfgCmd = PwrSeqCmd[AryIdx];



		RT_TRACE(

			_module_hal_init_c_,

			_drv_info_,

			(

				"HalPwrSeqCmdParsing: offset(%#x) cut_msk(%#x) fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",

				GET_PWR_CFG_OFFSET(PwrCfgCmd),

				GET_PWR_CFG_CUT_MASK(PwrCfgCmd),

				GET_PWR_CFG_FAB_MASK(PwrCfgCmd),

				GET_PWR_CFG_INTF_MASK(PwrCfgCmd),

				GET_PWR_CFG_BASE(PwrCfgCmd),

				GET_PWR_CFG_CMD(PwrCfgCmd),

				GET_PWR_CFG_MASK(PwrCfgCmd),

				GET_PWR_CFG_VALUE(PwrCfgCmd)

			)

		);



		/* 2 Only Handle the command whose FAB, CUT, and Interface are matched */

		if (

			(GET_PWR_CFG_FAB_MASK(PwrCfgCmd) & FabVersion) &&
@@ -77,19 +61,9 @@ u8 HalPwrSeqCmdParsing( 
		) {

			switch (GET_PWR_CFG_CMD(PwrCfgCmd)) {

			case PWR_CMD_READ:

				RT_TRACE(

					_module_hal_init_c_,

					_drv_info_,

					("HalPwrSeqCmdParsing: PWR_CMD_READ\n")

				);

				break;



			case PWR_CMD_WRITE:

				RT_TRACE(

					_module_hal_init_c_,

					_drv_info_,

					("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n")

				);

				offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);



				/*  */
@@ -124,11 +98,6 @@ u8 HalPwrSeqCmdParsing( 
				break;



			case PWR_CMD_POLLING:

				RT_TRACE(

					_module_hal_init_c_,

					_drv_info_,

					("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n")

				);



				bPollingBit = false;

				offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
@@ -160,11 +129,6 @@ u8 HalPwrSeqCmdParsing( 
				break;



			case PWR_CMD_DELAY:

				RT_TRACE(

					_module_hal_init_c_,

					_drv_info_,

					("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n")

				);

				if (GET_PWR_CFG_VALUE(PwrCfgCmd) == PWRSEQ_DELAY_US)

					udelay(GET_PWR_CFG_OFFSET(PwrCfgCmd));

				else
@@ -173,19 +137,9 @@ u8 HalPwrSeqCmdParsing( 


			case PWR_CMD_END:

				/*  When this command is parsed, end the process */

				RT_TRACE(

					_module_hal_init_c_,

					_drv_info_,

					("HalPwrSeqCmdParsing: PWR_CMD_END\n")

				);

				return true;



			default:

				RT_TRACE(

					_module_hal_init_c_,

					_drv_err_,

					("HalPwrSeqCmdParsing: Unknown CMD!!\n")

				);

				break;

			}

		}

drivers/staging/rtl8723bs/hal/hal_intf.c

+0 −2
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ uint rtw_hal_init(struct adapter *padapter) 
		DBG_871X("rtw_hal_init: hal__init fail\n");

	}



	RT_TRACE(_module_hal_init_c_, _drv_err_, ("-rtl871x_hal_init:status = 0x%x\n", status));



	return status;

}

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+0 −93
Original line number Diff line number Diff line
@@ -65,17 +65,6 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize) 
	remainSize_p1 = buffSize % blockSize_p1;



	if (blockCount_p1) {

		RT_TRACE(

			_module_hal_init_c_,

			_drv_notice_,

			(

				"_BlockWrite: [P1] buffSize(%d) blockSize_p1(%d) blockCount_p1(%d) remainSize_p1(%d)\n",

				buffSize,

				blockSize_p1,

				blockCount_p1,

				remainSize_p1

			)

		);

	}



	for (i = 0; i < blockCount_p1; i++) {
@@ -94,17 +83,6 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize) 
		remainSize_p2 = remainSize_p1%blockSize_p2;



		if (blockCount_p2) {

				RT_TRACE(

					_module_hal_init_c_,

					_drv_notice_,

					(

						"_BlockWrite: [P2] buffSize_p2(%d) blockSize_p2(%d) blockCount_p2(%d) remainSize_p2(%d)\n",

						(buffSize-offset),

						blockSize_p2,

						blockCount_p2,

						remainSize_p2

					)

				);

		}



	}
@@ -115,10 +93,6 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize) 


		blockCount_p3 = remainSize_p2 / blockSize_p3;



		RT_TRACE(_module_hal_init_c_, _drv_notice_,

				("_BlockWrite: [P3] buffSize_p3(%d) blockSize_p3(%d) blockCount_p3(%d)\n",

				(buffSize-offset), blockSize_p3, blockCount_p3));



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

			ret = rtw_write8(padapter, (FW_8723B_START_ADDRESS + offset + i), *(bufferPtr + offset + i));
@@ -181,7 +155,6 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size) 
			goto exit;

		}

	}

	RT_TRACE(_module_hal_init_c_, _drv_info_, ("_WriteFW Done- for Normal chip.\n"));



exit:

	return ret;
@@ -334,10 +307,8 @@ void rtl8723b_FirmwareSelfReset(struct adapter *padapter) 
			udelay(50);

			u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);

		}

		RT_TRACE(_module_hal_init_c_, _drv_notice_, ("-%s: 8051 reset success (%d)\n", __func__, Delay));



		if (Delay == 0) {

			RT_TRACE(_module_hal_init_c_, _drv_notice_, ("%s: Force 8051 reset!!!\n", __func__));

			/* force firmware reset */

			u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);

			rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2));
@@ -368,7 +339,6 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw) 
	struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;

	u8 tmp_ps;



	RT_TRACE(_module_hal_init_c_, _drv_info_, ("+%s\n", __func__));

	pFirmware = kzalloc(sizeof(struct rt_firmware), GFP_KERNEL);

	if (!pFirmware)

		return _FAIL;
@@ -409,11 +379,6 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw) 


	if (fw->size > FW_8723B_SIZE) {

		rtStatus = _FAIL;

		RT_TRACE(

			_module_hal_init_c_,

			_drv_err_,

			("Firmware size exceed 0x%X. Check it.\n", FW_8188E_SIZE)

		);

		goto exit;

	}
@@ -1948,12 +1913,6 @@ static void ResumeTxBeacon(struct adapter *padapter) 
{

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);





	/*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */

	/*  which should be read from register to a global variable. */



	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+ResumeTxBeacon\n"));



	pHalData->RegFwHwTxQCtrl |= BIT(6);

	rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl);

	rtw_write8(padapter, REG_TBTT_PROHIBIT+1, 0xff);
@@ -1965,12 +1924,6 @@ static void StopTxBeacon(struct adapter *padapter) 
{

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);





	/*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */

	/*  which should be read from register to a global variable. */



	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("+StopTxBeacon\n"));



	pHalData->RegFwHwTxQCtrl &= ~BIT(6);

	rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl);

	rtw_write8(padapter, REG_TBTT_PROHIBIT+1, 0x64);
@@ -2314,7 +2267,6 @@ static bool Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup) 
		else if (12 <= Channel && Channel <= 14)

			*pGroup = 4;

		else {

			RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("==>Hal_GetChnlGroup8723B in 2.4 G, but Channel %d in Group not found\n", Channel));

		}

	} else {

		bIn24G = false;
@@ -2348,20 +2300,9 @@ static bool Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup) 
		else if (173  <= Channel && Channel <= 177)

			*pGroup = 13;

		else {

			RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("==>Hal_GetChnlGroup8723B in 5G, but Channel %d in Group not found\n", Channel));

		}



	}

	RT_TRACE(

		_module_hci_hal_init_c_,

		_drv_info_,

		(

			"<==Hal_GetChnlGroup8723B,  (%s) Channel = %d, Group =%d,\n",

			bIn24G ? "2.4G" : "5G",

			Channel,

			*pGroup

		)

	);

	return bIn24G;

}
@@ -2376,7 +2317,6 @@ void Hal_InitPGData(struct adapter *padapter, u8 *PROMContent) 
			memcpy((void *)PROMContent, (void *)pEEPROM->efuse_eeprom_data, HWSET_MAX_SIZE_8723B);

		}

	} else {/* autoload fail */

		RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("AutoLoad Fail reported from CR9346!!\n"));

		if (!pEEPROM->EepromOrEfuse)

			EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, false);

		memcpy((void *)PROMContent, (void *)pEEPROM->efuse_eeprom_data, HWSET_MAX_SIZE_8723B);
@@ -2397,8 +2337,6 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u8 *hwinfo) 
		pEEPROM->bautoload_fail_flag = true;

	} else

		pEEPROM->bautoload_fail_flag = false;



	RT_TRACE(_module_hal_init_c_, _drv_notice_, ("EEPROM ID = 0x%04x\n", EEPROMId));

}



static void Hal_ReadPowerValueFromPROM_8723B(
@@ -2540,9 +2478,6 @@ void Hal_EfuseParseTxPowerInfo_8723B( 
				pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][group];

			}

#ifdef DEBUG

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("======= Path %d, ChannelIndex %d, Group %d =======\n", rfPath, ch, group));

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("Index24G_CCK_Base[%d][%d] = 0x%x\n", rfPath, ch, pHalData->Index24G_CCK_Base[rfPath][ch]));

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("Index24G_BW40_Base[%d][%d] = 0x%x\n", rfPath, ch, pHalData->Index24G_BW40_Base[rfPath][ch]));

#endif

		}
@@ -2553,11 +2488,6 @@ void Hal_EfuseParseTxPowerInfo_8723B( 
			pHalData->BW40_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW40_Diff[rfPath][TxCount];



#ifdef DEBUG

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("--------------------------------------- 2.4G ---------------------------------------\n"));

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("CCK_24G_Diff[%d][%d]= %d\n", rfPath, TxCount, pHalData->CCK_24G_Diff[rfPath][TxCount]));

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("OFDM_24G_Diff[%d][%d]= %d\n", rfPath, TxCount, pHalData->OFDM_24G_Diff[rfPath][TxCount]));

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("BW20_24G_Diff[%d][%d]= %d\n", rfPath, TxCount, pHalData->BW20_24G_Diff[rfPath][TxCount]));

			RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("BW40_24G_Diff[%d][%d]= %d\n", rfPath, TxCount, pHalData->BW40_24G_Diff[rfPath][TxCount]));

#endif

		}

	}
@@ -2569,8 +2499,6 @@ void Hal_EfuseParseTxPowerInfo_8723B( 
			pHalData->EEPROMRegulatory = (EEPROM_DEFAULT_BOARD_OPTION&0x7);	/* bit0~2 */

	} else

		pHalData->EEPROMRegulatory = 0;



	RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory));

}



void Hal_EfuseParseBTCoexistInfo_8723B(
@@ -2660,8 +2588,6 @@ void Hal_EfuseParseEEPROMVer_8723B( 
		pHalData->EEPROMVersion = hwinfo[EEPROM_VERSION_8723B];

	else

		pHalData->EEPROMVersion = 1;

	RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("Hal_EfuseParseEEPROMVer(), EEVer = %d\n",

		pHalData->EEPROMVersion));

}
@@ -2728,8 +2654,6 @@ void Hal_EfuseParseChnlPlan_8723B( 
	);



	Hal_ChannelPlanToRegulation(padapter, padapter->mlmepriv.ChannelPlan);



	RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("EEPROM ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan));

}



void Hal_EfuseParseCustomerID_8723B(
@@ -2743,8 +2667,6 @@ void Hal_EfuseParseCustomerID_8723B( 
		pHalData->EEPROMCustomerID = hwinfo[EEPROM_CustomID_8723B];

	else

		pHalData->EEPROMCustomerID = 0;



	RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID));

}



void Hal_EfuseParseAntennaDiversity_8723B(
@@ -2768,8 +2690,6 @@ void Hal_EfuseParseXtal_8723B( 
			pHalData->CrystalCap = EEPROM_Default_CrystalCap_8723B;	   /* what value should 8812 set? */

	} else

		pHalData->CrystalCap = EEPROM_Default_CrystalCap_8723B;



	RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("EEPROM CrystalCap: 0x%2x\n", pHalData->CrystalCap));

}
@@ -2792,8 +2712,6 @@ void Hal_EfuseParseThermalMeter_8723B( 
		pHalData->bAPKThermalMeterIgnore = true;

		pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_8723B;

	}



	RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("EEPROM ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter));

}
@@ -3111,10 +3029,7 @@ static void rtl8723b_fill_default_txdesc( 
			ptxdesc->sw_define = (u8)(GET_PRIMARY_ADAPTER(padapter)->xmitpriv.seq_no);

		}

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

		RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: TXAGG_FRAMETAG\n", __func__));

	} else {

		RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: frame_tag = 0x%x\n", __func__, pxmitframe->frame_tag));



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

		ptxdesc->rate_id = pattrib->raid; /*  Rate ID */

		ptxdesc->qsel = pattrib->qsel;
@@ -3588,7 +3503,6 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf) 
		break;

	case C2H_DBG:

		{

			RT_TRACE(_module_hal_init_c_, _drv_info_, ("c2h_handler_8723b: %s\n", pC2hEvent->payload));

		}

		break;
@@ -3601,9 +3515,7 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf) 
		break;



	case C2H_HW_INFO_EXCH:

		RT_TRACE(_module_hal_init_c_, _drv_info_, ("[BT], C2H_HW_INFO_EXCH\n"));

		for (index = 0; index < pC2hEvent->plen; index++) {

			RT_TRACE(_module_hal_init_c_, _drv_info_, ("[BT], tmpBuf[%d]= 0x%x\n", index, pC2hEvent->payload[index]));

		}

		break;
@@ -3637,7 +3549,6 @@ static void process_c2h_event(struct adapter *padapter, struct c2h_evt_hdr_t *pC 
		break;

	case C2H_DBG:

		{

			RT_TRACE(_module_hal_init_c_, _drv_info_, ("C2HCommandHandler: %s\n", c2hBuf));

		}

		break;
@@ -3650,9 +3561,7 @@ static void process_c2h_event(struct adapter *padapter, struct c2h_evt_hdr_t *pC 
		break;



	case C2H_HW_INFO_EXCH:

		RT_TRACE(_module_hal_init_c_, _drv_info_, ("[BT], C2H_HW_INFO_EXCH\n"));

		for (index = 0; index < pC2hEvent->CmdLen; index++) {

			RT_TRACE(_module_hal_init_c_, _drv_info_, ("[BT], tmpBuf[%d]= 0x%x\n", index, c2hBuf[index]));

		}

		break;
@@ -4055,7 +3964,6 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val) 
			u32 usNavUpper = *((u32 *)val);



			if (usNavUpper > HAL_NAV_UPPER_UNIT_8723B * 0xFF) {

				RT_TRACE(_module_hal_init_c_, _drv_notice_, ("The setting value (0x%08X us) of NAV_UPPER is larger than (%d * 0xFF)!!!\n", usNavUpper, HAL_NAV_UPPER_UNIT_8723B));

				break;

			}
@@ -4359,7 +4267,6 @@ void rtl8723b_start_thread(struct adapter *padapter) 


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

	if (IS_ERR(xmitpriv->SdioXmitThread)) {

		RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("%s: start rtl8723bs_xmit_thread FAIL!!\n", __func__));

	}

}

drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c

+3 −29
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ void PHY_SetTxPowerIndex( 
			break;

		}

	} else {

		RT_TRACE(_module_hal_init_c_, _drv_err_, ("Invalid RFPath!!\n"));

	}

}
@@ -604,11 +603,7 @@ void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 Channel) 
		RFPath = pHalData->ant_path;

	}



	RT_TRACE(_module_hal_init_c_, _drv_info_, ("==>PHY_SetTxPowerLevel8723B()\n"));



	PHY_SetTxPowerLevelByPath(Adapter, Channel, RFPath);



	RT_TRACE(_module_hal_init_c_, _drv_info_, ("<==PHY_SetTxPowerLevel8723B()\n"));

}



void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel)
@@ -648,23 +643,13 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter) 
	u8 SCSettingOf40 = 0, SCSettingOf20 = 0;

	struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);



	RT_TRACE(

		_module_hal_init_c_,

		_drv_info_,

		(

			"SCMapping: VHT Case: pHalData->CurrentChannelBW %d, pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d\n",

			pHalData->CurrentChannelBW,

			pHalData->nCur80MhzPrimeSC,

			pHalData->nCur40MhzPrimeSC

		)

	);

	if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) {

		if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)

			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

			RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n"));

			{}



		if (

			(pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) &&
@@ -687,27 +672,16 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter) 
		)

			SCSettingOf20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ;

		else

			RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n"));

			{}

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

		RT_TRACE(

			_module_hal_init_c_,

			_drv_info_,

			(

				"SCMapping: VHT Case: pHalData->CurrentChannelBW %d, pHalData->nCur40MhzPrimeSC %d\n",

				pHalData->CurrentChannelBW,

				pHalData->nCur40MhzPrimeSC

			)

		);



		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

			RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n"));

			{}

	}



	RT_TRACE(_module_hal_init_c_, _drv_info_, ("SCMapping: SC Value %x\n", ((SCSettingOf40 << 4) | SCSettingOf20)));

	return  (SCSettingOf40 << 4) | SCSettingOf20;

}

drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c

+0 −2
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t) 
						update_recvframe_phyinfo(precvframe, (struct phy_stat *)ptr);



					if (rtw_recv_entry(precvframe) != _SUCCESS) {

						RT_TRACE(_module_rtl871x_recv_c_, _drv_dump_, ("%s: rtw_recv_entry(precvframe) != _SUCCESS\n", __func__));

					}

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

					struct c2h_evt_hdr_t	C2hEvent;
@@ -404,7 +403,6 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter) 
	precvpriv->pallocated_recv_buf = rtw_zmalloc(n);

	if (!precvpriv->pallocated_recv_buf) {

		res = _FAIL;

		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n"));

		goto exit;

	}