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

staging: r8188eu: remove ODM_sleep_ms() 



ODM_sleep_ms() is just a wrapper around msleep().
Remove ODM_sleep_ms() and call msleep() directly.

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


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

drivers/staging/r8188eu/hal/HalPhyRf_8188e.c

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t) 
	/* 4. Set LC calibration begin	bit15 */

	rtl8188e_PHY_SetRFReg(adapt, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal | 0x08000);



	ODM_sleep_ms(100);

	msleep(100);



	/* Restore original situation */

	if ((tmpreg & 0x70) != 0) {

drivers/staging/r8188eu/hal/odm_RegConfig8188E.c

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 
			   u32 RegAddr)

{

	if (Addr == 0xffe) {

		ODM_sleep_ms(50);

		msleep(50);

	} else if (Addr == 0xfd) {

		ODM_delay_ms(5);

	} else if (Addr == 0xfc) {
@@ -50,7 +50,7 @@ void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 
				   u32 Bitmask, u32 Data)

{

	if (Addr == 0xfe)

		ODM_sleep_ms(50);

		msleep(50);

	else if (Addr == 0xfd)

		ODM_delay_ms(5);

	else if (Addr == 0xfc)
@@ -68,7 +68,7 @@ void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 
void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask, u32 Data)

{

	if (Addr == 0xfe) {

		ODM_sleep_ms(50);

		msleep(50);

	} else if (Addr == 0xfd) {

		ODM_delay_ms(5);

	} else if (Addr == 0xfc) {

drivers/staging/r8188eu/hal/odm_interface.c

+0 −5
Original line number Diff line number Diff line
@@ -20,8 +20,3 @@ void ODM_delay_us(u32 us) 
{

	udelay(us);

}
 


void ODM_sleep_ms(u32 ms)

{

	msleep(ms);

}

drivers/staging/r8188eu/include/odm_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -21,6 +21,4 @@ void ODM_delay_ms(u32 ms); 


void ODM_delay_us(u32 us);



void ODM_sleep_ms(u32 ms);



#endif	/*  __ODM_INTERFACE_H__ */