Commit a620afdb authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: use __func__ in hal directory 



Use __func__ instead of hardcoded function names to clear
checkpatch warnings.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200917071330.31740-1-straube.linux@gmail.com


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

drivers/staging/rtl8188eu/hal/hal_intf.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ uint rtw_hal_init(struct adapter *adapt) 
			rtw_hal_notch_filter(adapt, 1);

	} else {

		adapt->hw_init_completed = false;

		DBG_88E("rtw_hal_init: hal__init fail\n");

		DBG_88E("%s: hal__init fail\n", __func__);

	}



	RT_TRACE(_module_hal_init_c_, _drv_err_,
@@ -41,7 +41,7 @@ uint rtw_hal_deinit(struct adapter *adapt) 
	if (status == _SUCCESS)

		adapt->hw_init_completed = false;

	else

		DBG_88E("\n rtw_hal_deinit: hal_init fail\n");

		DBG_88E("\n %s: hal_init fail\n", __func__);



	return status;

}

drivers/staging/rtl8188eu/hal/odm.c

+30 −30
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) 


void odm_CmnInfoInit_Debug(struct odm_dm_struct *pDM_Odm)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoInit_Debug==>\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("%s==>\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportPlatform=%d\n", pDM_Odm->SupportPlatform));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportAbility=0x%x\n", pDM_Odm->SupportAbility));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportInterface=%d\n", pDM_Odm->SupportInterface));
@@ -267,7 +267,7 @@ void odm_CmnInfoInit_Debug(struct odm_dm_struct *pDM_Odm) 


void odm_CmnInfoHook_Debug(struct odm_dm_struct *pDM_Odm)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug==>\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("%s==>\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pNumTxBytesUnicast=%llu\n", *pDM_Odm->pNumTxBytesUnicast));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pNumRxBytesUnicast=%llu\n", *pDM_Odm->pNumRxBytesUnicast));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pWirelessMode=0x%x\n", *pDM_Odm->pWirelessMode));
@@ -282,7 +282,7 @@ void odm_CmnInfoHook_Debug(struct odm_dm_struct *pDM_Odm) 


void odm_CmnInfoUpdate_Debug(struct odm_dm_struct *pDM_Odm)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoUpdate_Debug==>\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("%s==>\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bWIFI_Direct=%d\n", pDM_Odm->bWIFI_Direct));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bWIFI_Display=%d\n", pDM_Odm->bWIFI_Display));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bLinked=%d\n", pDM_Odm->bLinked));
@@ -339,21 +339,21 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
	u8 dm_dig_max, dm_dig_min;

	u8 CurrentIGI = pDM_DigTable->CurIGValue;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG()==>\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s()==>\n", __func__));

	if ((!(pDM_Odm->SupportAbility & ODM_BB_DIG)) || (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

			     ("odm_DIG() Return: SupportAbility ODM_BB_DIG or ODM_BB_FA_CNT is disabled\n"));

			     ("%s() Return: SupportAbility ODM_BB_DIG or ODM_BB_FA_CNT is disabled\n", __func__));

		return;

	}



	if (*pDM_Odm->pbScanInProcess) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: In Scan Progress\n"));

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s() Return: In Scan Progress\n", __func__));

		return;

	}



	/* add by Neil Chen to avoid PSD is processing */

	if (!pDM_Odm->bDMInitialGainEnable) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: PSD is Processing\n"));

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s() Return: PSD is Processing\n", __func__));

		return;

	}
@@ -383,18 +383,18 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
			else

				DIG_Dynamic_MIN = pDM_Odm->RSSI_Min;

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

				     ("odm_DIG() : bOneEntryOnly=true,  DIG_Dynamic_MIN=0x%x\n",

				     DIG_Dynamic_MIN));

				     ("%s() : bOneEntryOnly=true,  DIG_Dynamic_MIN=0x%x\n",

				      __func__, DIG_Dynamic_MIN));

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

				     ("odm_DIG() : pDM_Odm->RSSI_Min=%d\n",

				     pDM_Odm->RSSI_Min));

				     ("%s() : pDM_Odm->RSSI_Min=%d\n",

				      __func__, pDM_Odm->RSSI_Min));

		} else if (pDM_Odm->SupportAbility & ODM_BB_ANT_DIV) {

			/* 1 Lower Bound for 88E AntDiv */

			if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) {

				DIG_Dynamic_MIN = (u8)pDM_DigTable->AntDiv_RSSI_max;

				ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

					     ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d\n",

					     pDM_DigTable->AntDiv_RSSI_max));

					     ("%s(): pDM_DigTable->AntDiv_RSSI_max=%d\n",

					      __func__, pDM_DigTable->AntDiv_RSSI_max));

			}

		} else {

			DIG_Dynamic_MIN = dm_dig_min;
@@ -402,7 +402,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
	} else {

		pDM_DigTable->rx_gain_range_max = dm_dig_max;

		DIG_Dynamic_MIN = dm_dig_min;

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() : No Link\n"));

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s() : No Link\n", __func__));

	}



	/* 1 Modify DIG lower bound, deal with abnormally large false alarm */
@@ -433,11 +433,11 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				if ((pDM_DigTable->ForbiddenIGI - 1) < DIG_Dynamic_MIN) { /* DM_DIG_MIN) */

					pDM_DigTable->ForbiddenIGI = DIG_Dynamic_MIN; /* DM_DIG_MIN; */

					pDM_DigTable->rx_gain_range_min = DIG_Dynamic_MIN; /* DM_DIG_MIN; */

					ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): Normal Case: At Lower Bound\n"));

					ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): Normal Case: At Lower Bound\n", __func__));

				} else {

					pDM_DigTable->ForbiddenIGI--;

					pDM_DigTable->rx_gain_range_min = (pDM_DigTable->ForbiddenIGI + 1);

					ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): Normal Case: Approach Lower Bound\n"));

					ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): Normal Case: Approach Lower Bound\n", __func__));

				}

			} else {

				pDM_DigTable->LargeFAHit = 0;
@@ -445,12 +445,12 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
		}

	}

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

		     ("odm_DIG(): pDM_DigTable->LargeFAHit=%d\n",

		     pDM_DigTable->LargeFAHit));

		     ("%s(): pDM_DigTable->LargeFAHit=%d\n",

		      __func__, pDM_DigTable->LargeFAHit));



	/* 1 Adjust initial gain by false alarm */

	if (pDM_Odm->bLinked) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): DIG AfterLink\n"));

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): DIG AfterLink\n", __func__));

		if (FirstConnect) {

			CurrentIGI = pDM_Odm->RSSI_Min;

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("DIG: First Connect\n"));
@@ -463,10 +463,10 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				CurrentIGI = CurrentIGI - 2;/* pDM_DigTable->CurIGValue =pDM_DigTable->PreIGValue-1; */

		}

	} else {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): DIG BeforeLink\n"));

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): DIG BeforeLink\n", __func__));

		if (FirstDisConnect) {

			CurrentIGI = pDM_DigTable->rx_gain_range_min;

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): First DisConnect\n"));

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): First DisConnect\n", __func__));

		} else {

			/* 2012.03.30 LukeLee: enable DIG before link but with very high thresholds */

			if (pFalseAlmCnt->Cnt_all > 10000)
@@ -475,10 +475,10 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				CurrentIGI = CurrentIGI + 1;/* pDM_DigTable->CurIGValue = pDM_DigTable->PreIGValue+1; */

			else if (pFalseAlmCnt->Cnt_all < 500)

				CurrentIGI = CurrentIGI - 1;/* pDM_DigTable->CurIGValue =pDM_DigTable->PreIGValue-1; */

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): England DIG\n"));

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): England DIG\n", __func__));

		}

	}

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): DIG End Adjust IGI\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): DIG End Adjust IGI\n", __func__));

	/* 1 Check initial gain by upper/lower bound */

	if (CurrentIGI > pDM_DigTable->rx_gain_range_max)

		CurrentIGI = pDM_DigTable->rx_gain_range_max;
@@ -486,10 +486,10 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
		CurrentIGI = pDM_DigTable->rx_gain_range_min;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

		     ("odm_DIG(): rx_gain_range_max=0x%x, rx_gain_range_min=0x%x\n",

		     pDM_DigTable->rx_gain_range_max, pDM_DigTable->rx_gain_range_min));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): TotalFA=%d\n", pFalseAlmCnt->Cnt_all));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): CurIGValue=0x%x\n", CurrentIGI));

		     ("%s(): rx_gain_range_max=0x%x, rx_gain_range_min=0x%x\n",

		      __func__, pDM_DigTable->rx_gain_range_max, pDM_DigTable->rx_gain_range_min));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): TotalFA=%d\n", __func__, pFalseAlmCnt->Cnt_all));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): CurIGValue=0x%x\n", __func__, CurrentIGI));



	/* 2 High power RSSI threshold */
@@ -557,7 +557,7 @@ void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm) 


	FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD, ("Enter odm_FalseAlarmCounterStatistics\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD, ("Enter %s\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD,

		     ("Cnt_Fast_Fsync=%d, Cnt_SB_Search_fail=%d\n",

		     FalseAlmCnt->Cnt_Fast_Fsync, FalseAlmCnt->Cnt_SB_Search_fail));
@@ -1015,13 +1015,13 @@ void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm) 
	/*  2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */

	/*  at the same time. In the stage2/3, we need to prive universal interface and merge all */

	/*  HW dynamic mechanism. */

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("odm_EdcaTurboCheck========================>\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("%s========================>\n", __func__));



	if (!(pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO))

		return;



	odm_EdcaTurboCheckCE(pDM_Odm);

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("<========================odm_EdcaTurboCheck\n"));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("<========================%s\n", __func__));

}	/*  odm_CheckEdcaTurbo */



void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm)

drivers/staging/rtl8188eu/hal/phy.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static void dm_txpwr_track_setpwr(struct odm_dm_struct *dm_odm) 
{

	if (dm_odm->BbSwingFlagOfdm || dm_odm->BbSwingFlagCck) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,

			     ("dm_txpwr_track_setpwr CH=%d\n", *dm_odm->pChannel));

			     ("%s CH=%d\n", __func__, *dm_odm->pChannel));

		phy_set_tx_power_level(dm_odm->Adapter, *dm_odm->pChannel);

		dm_odm->BbSwingFlagOfdm = false;

		dm_odm->BbSwingFlagCck = false;

drivers/staging/rtl8188eu/hal/pwrseqcmd.c

+13 −12
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
		pwrcfgcmd = pwrseqcmd[aryidx];



		RT_TRACE(_module_hal_init_c_, _drv_info_,

			 ("rtl88eu_pwrseqcmdparsing: offset(%#x) cut_msk(%#x)"

			 ("%s: offset(%#x) cut_msk(%#x)"

			  " cmd(%#x)"

			  "msk(%#x) value(%#x)\n",

			  __func__,

			  GET_PWR_CFG_OFFSET(pwrcfgcmd),

			  GET_PWR_CFG_CUT_MASK(pwrcfgcmd),

			  GET_PWR_CFG_CMD(pwrcfgcmd),
@@ -40,11 +41,11 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
			switch (GET_PWR_CFG_CMD(pwrcfgcmd)) {

			case PWR_CMD_READ:

				RT_TRACE(_module_hal_init_c_, _drv_info_,

					 ("rtl88eu_pwrseqcmdparsing: PWR_CMD_READ\n"));

					 ("%s: PWR_CMD_READ\n", __func__));

				break;

			case PWR_CMD_WRITE:

				RT_TRACE(_module_hal_init_c_, _drv_info_,

					 ("rtl88eu_pwrseqcmdparsing: PWR_CMD_WRITE\n"));

					 ("%s: PWR_CMD_WRITE\n", __func__));

				offset = GET_PWR_CFG_OFFSET(pwrcfgcmd);



				/*  Read the value from system register */
@@ -59,7 +60,7 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
				break;

			case PWR_CMD_POLLING:

				RT_TRACE(_module_hal_init_c_, _drv_info_,

					 ("rtl88eu_pwrseqcmdparsing: PWR_CMD_POLLING\n"));

					 ("%s: PWR_CMD_POLLING\n", __func__));



				poll_bit = false;

				offset = GET_PWR_CFG_OFFSET(pwrcfgcmd);
@@ -81,7 +82,7 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
				break;

			case PWR_CMD_DELAY:

				RT_TRACE(_module_hal_init_c_, _drv_info_,

					 ("rtl88eu_pwrseqcmdparsing: PWR_CMD_DELAY\n"));

					 ("%s: PWR_CMD_DELAY\n", __func__));

				if (GET_PWR_CFG_VALUE(pwrcfgcmd) == PWRSEQ_DELAY_US)

					udelay(GET_PWR_CFG_OFFSET(pwrcfgcmd));

				else
@@ -90,11 +91,11 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
			case PWR_CMD_END:

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

				RT_TRACE(_module_hal_init_c_, _drv_info_,

					 ("rtl88eu_pwrseqcmdparsing: PWR_CMD_END\n"));

					 ("%s: PWR_CMD_END\n", __func__));

				return true;

			default:

				RT_TRACE(_module_hal_init_c_, _drv_err_,

					 ("rtl88eu_pwrseqcmdparsing: Unknown CMD!!\n"));

					 ("%s: Unknown CMD!!\n", __func__));

				break;

			}

		}

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void _8051Reset88E(struct adapter *padapter) 
	u1bTmp = usb_read8(padapter, REG_SYS_FUNC_EN + 1);

	usb_write8(padapter, REG_SYS_FUNC_EN + 1, u1bTmp & (~BIT(2)));

	usb_write8(padapter, REG_SYS_FUNC_EN + 1, u1bTmp | (BIT(2)));

	DBG_88E("=====> _8051Reset88E(): 8051 reset success .\n");

	DBG_88E("=====> %s(): 8051 reset success .\n", __func__);

}



void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)