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

staging: r8188eu: remove ODM_delay_us() 



ODM_delay_us() is just a wrapper around udelay().
Remove ODM_delay_us() and call udelay() directly.

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


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

drivers/staging/r8188eu/hal/odm_RegConfig8188E.c

+12 −12
Original line number Diff line number Diff line
@@ -14,15 +14,15 @@ void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 
	} else if (Addr == 0xfc) {

		ODM_delay_ms(1);

	} else if (Addr == 0xfb) {

		ODM_delay_us(50);

		udelay(50);

	} else if (Addr == 0xfa) {

		ODM_delay_us(5);

		udelay(5);

	} else if (Addr == 0xf9) {

		ODM_delay_us(1);

		udelay(1);

	} else {

		rtl8188e_PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH, RegAddr, bRFRegOffsetMask, Data);

		/*  Add 1us delay between BB/RF register setting. */

		ODM_delay_us(1);

		udelay(1);

	}

}
@@ -43,7 +43,7 @@ void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask 
{

	rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data);

	/*  Add 1us delay between BB/RF register setting. */

	ODM_delay_us(1);

	udelay(1);

}



void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,
@@ -56,11 +56,11 @@ void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 
	else if (Addr == 0xfc)

		ODM_delay_ms(1);

	else if (Addr == 0xfb)

		ODM_delay_us(50);

		udelay(50);

	else if (Addr == 0xfa)

		ODM_delay_us(5);

		udelay(5);

	else if (Addr == 0xf9)

		ODM_delay_us(1);

		udelay(1);

	else

		storePwrIndexDiffRateOffset(pDM_Odm->Adapter, Addr, Bitmask, Data);

}
@@ -74,17 +74,17 @@ void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask 
	} else if (Addr == 0xfc) {

		ODM_delay_ms(1);

	} else if (Addr == 0xfb) {

		ODM_delay_us(50);

		udelay(50);

	} else if (Addr == 0xfa) {

		ODM_delay_us(5);

		udelay(5);

	} else if (Addr == 0xf9) {

		ODM_delay_us(1);

		udelay(1);

	} else {

		if (Addr == 0xa24)

			pDM_Odm->RFCalibrateInfo.RegA24 = Data;

		rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data);



		/*  Add 1us delay between BB/RF register setting. */

		ODM_delay_us(1);

		udelay(1);

	}

}

drivers/staging/r8188eu/hal/odm_interface.c

+0 −5
Original line number Diff line number Diff line
@@ -15,8 +15,3 @@ void ODM_delay_ms(u32 ms) 
{

	mdelay(ms);

}
 


void ODM_delay_us(u32 us)

{

	udelay(us);

}

drivers/staging/r8188eu/include/odm_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -19,6 +19,4 @@ s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2, 
/*  ODM Timer relative API. */

void ODM_delay_ms(u32 ms);



void ODM_delay_us(u32 us);



#endif	/*  __ODM_INTERFACE_H__ */