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

staging: r8188eu: remove ODM_delay_ms() 



ODM_delay_ms() is just a wrapper around mdelay().
Remove ODM_delay_ms() and call mdelay() directly.

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


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

drivers/staging/r8188eu/hal/HalPhyRf_8188e.c

+4 −4
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ phy_PathA_IQK_8188E(struct adapter *adapt) 


	/*  delay x ms */

	/* PlatformStallExecution(IQK_DELAY_TIME_88E*1000); */

	ODM_delay_ms(IQK_DELAY_TIME_88E);

	mdelay(IQK_DELAY_TIME_88E);



	/*  Check failed */

	regeac = rtl8188e_PHY_QueryBBReg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
@@ -434,7 +434,7 @@ phy_PathA_RxIQK(struct adapter *adapt) 
	rtl8188e_PHY_SetBBReg(adapt, rIQK_AGC_Pts, bMaskDWord, 0xf8000000);



	/*  delay x ms */

	ODM_delay_ms(IQK_DELAY_TIME_88E);

	mdelay(IQK_DELAY_TIME_88E);



	/*  Check failed */

	regeac = rtl8188e_PHY_QueryBBReg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
@@ -478,7 +478,7 @@ phy_PathA_RxIQK(struct adapter *adapt) 


	/*  delay x ms */

	/* PlatformStallExecution(IQK_DELAY_TIME_88E*1000); */

	ODM_delay_ms(IQK_DELAY_TIME_88E);

	mdelay(IQK_DELAY_TIME_88E);



	/*  Check failed */

	regeac = rtl8188e_PHY_QueryBBReg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
@@ -1000,7 +1000,7 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt) 
		return;



	while (*dm_odm->pbScanInProcess && timecount < timeout) {

		ODM_delay_ms(50);

		mdelay(50);

		timecount += 50;

	}

drivers/staging/r8188eu/hal/odm_RegConfig8188E.c

+6 −6
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 
	if (Addr == 0xffe) {

		msleep(50);

	} else if (Addr == 0xfd) {

		ODM_delay_ms(5);

		mdelay(5);

	} else if (Addr == 0xfc) {

		ODM_delay_ms(1);

		mdelay(1);

	} else if (Addr == 0xfb) {

		udelay(50);

	} else if (Addr == 0xfa) {
@@ -52,9 +52,9 @@ void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 
	if (Addr == 0xfe)

		msleep(50);

	else if (Addr == 0xfd)

		ODM_delay_ms(5);

		mdelay(5);

	else if (Addr == 0xfc)

		ODM_delay_ms(1);

		mdelay(1);

	else if (Addr == 0xfb)

		udelay(50);

	else if (Addr == 0xfa)
@@ -70,9 +70,9 @@ void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask 
	if (Addr == 0xfe) {

		msleep(50);

	} else if (Addr == 0xfd) {

		ODM_delay_ms(5);

		mdelay(5);

	} else if (Addr == 0xfc) {

		ODM_delay_ms(1);

		mdelay(1);

	} else if (Addr == 0xfb) {

		udelay(50);

	} else if (Addr == 0xfa) {

drivers/staging/r8188eu/hal/odm_interface.c

+0 −6
Original line number Diff line number Diff line
@@ -9,9 +9,3 @@ s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2, u 
{

	return !memcmp(pBuf1, pBuf2, length);

}
 


/*  ODM Timer relative API. */

void ODM_delay_ms(u32 ms)

{

	mdelay(ms);

}

drivers/staging/r8188eu/include/odm_interface.h

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,4 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void *pContext); 
s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2,

		      u32 length);



/*  ODM Timer relative API. */

void ODM_delay_ms(u32 ms);



#endif	/*  __ODM_INTERFACE_H__ */