Commit eabc1a26 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove RT_TRACE calls from hal/rtl8188e_hal_init.c 



Remove RT_TRACE macro calls from hal/rtl8188e_hal_init.c, so that ultimately
the macro definition itself can eventually be removed.

Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210803230535.74254-6-phil@philpotter.co.uk


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

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

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

	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++) {

		ret = rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * blockSize_p1), blockSize_p1, (bufferPtr + i * blockSize_p1));

		if (ret == _FAIL)
@@ -428,12 +422,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) {

				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));

		}



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

			ret = rtw_writeN(padapter, (FW_8188E_START_ADDRESS + offset + i*blockSize_p2), blockSize_p2, (bufferPtr + offset + i*blockSize_p2));
@@ -448,10 +436,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_8188E_START_ADDRESS + offset + i), *(bufferPtr + offset + i));
@@ -502,7 +486,6 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size) 
		if (ret == _FAIL)

			goto exit;

	}

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

exit:

	return ret;

}
@@ -578,7 +561,6 @@ static int load_firmware(struct rt_firmware *pFirmware, struct device *device) 
	}

	if (fw->size > FW_8188E_SIZE) {

		rtStatus = _FAIL;

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

		goto Exit;

	}
@@ -610,7 +592,6 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter) 
	u32 FirmwareLen;

	static int log_version;



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

	if (!dvobj->firmware.szFwBuffer)

		rtStatus = load_firmware(&dvobj->firmware, device);

	if (rtStatus == _FAIL) {
@@ -672,7 +653,6 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter) 
		DBG_88E("DL Firmware failed!\n");

		goto Exit;

	}

	RT_TRACE(_module_hal_init_c_, _drv_info_, ("Firmware is ready to run!\n"));



Exit:

	return rtStatus;
@@ -1896,7 +1876,6 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data) 
			break;



		if (count > POLLING_LLT_THRESHOLD) {

			RT_TRACE(_module_hal_init_c_, _drv_err_, ("Failed to polling write LLT done at address %d!\n", address));

			status = _FAIL;

			break;

		}
@@ -1955,7 +1934,6 @@ Hal_InitPGData88E(struct adapter *padapter) 
			EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, false);

		}

	} else {/* autoload fail */

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

		/* update to default value 0xFF */

		if (!is_boot_from_eeprom(padapter))

			EFUSE_ShadowMapUpdate(padapter, EFUSE_WIFI, false);
@@ -2246,9 +2224,6 @@ void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo, bool AutoL 
	} else {

		pHalData->EEPROMVersion = 1;

	}

	RT_TRACE(_module_hci_hal_init_c_, _drv_info_,

		 ("Hal_EfuseParseEEPROMVer(), EEVer = %d\n",

		 pHalData->EEPROMVersion));

}



void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail)