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: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211229205108.26373-9-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 24e653eb5321cc7b3914a1dc248dae725306ae83..35e1c81bf9a7c74763d5e88b879de56fda000a0d 100644 (file)
--- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
@@ -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) {

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

diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index f701d85200194b7f8ea1c0532dab21faf6c98157..249577a9f8674bb4ad5e896a84ccd0a463567928 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -20,8 +20,3 @@ void ODM_delay_us(u32 us)
 {
        udelay(us);
 }
-
-void ODM_sleep_ms(u32 ms)
-{
-       msleep(ms);
-}

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