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: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211229205108.26373-11-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
index 35e1c81bf9a7c74763d5e88b879de56fda000a0d..5db8ea92046e989e082492ac42d60dfa7a2bf4cb 100644 (file)
--- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
@@ -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;
        }
 

diff --git a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c b/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c
index 20201353c14f16fa4ab36ba8f7b76d6aef5de68f..3f1e30eb1a15da65d691a31506f29d62d997cb3a 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c
+++ b/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c
@@ -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) {

diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index ce9832ab7b1342485c36115bff3e711d9af92a6c..03a1490691261a2d0b64d845f9e6103b214ab54e 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -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);
-}

diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h
index 20c662628646a730141b83fdeb863579e1f2038a..d5a75dfe0f8e543624d595726022b94caaa03f8a 100644 (file)
--- a/drivers/staging/r8188eu/include/odm_interface.h
+++ b/drivers/staging/r8188eu/include/odm_interface.h
@@ -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__ */