staging: r8188eu: Replace wrappers ODM_sleep_us and rtw_usleep_os

Each of the uses in the code asks for a sleep of 100 usec or so. On Linux,
these are converted to msleep(1).

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index d5ad1dc09de3b98f2ac197296293af6390c8e4b7..c011efe8de91144d24b270cc0af20996fc41e543 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -396,7 +396,7 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
                        DBG_88E("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms);
                        break;
                }
-               rtw_usleep_os(100);
+               msleep(1);
        }
 
        return err;

diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c b/drivers/staging/rtl8188eu/hal/odm_interface.c
index e7fee794b3373630d70934827fdebf4b538cc3a5..780cb1101e5daf9cff9ea8f7af9e405dfd30c25f 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -146,12 +146,6 @@ void ODM_IsWorkItemScheduled(void *pRtWorkItem)
 {
 }
 
-/*  ODM Timer relative API. */
-void ODM_sleep_us(u32 us)
-{
-       rtw_usleep_os(us);
-}
-
 void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer, u32 msDelay)
 {
        _set_timer(pTimer, msDelay); /* ms */

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index d81193bfb8c8ed7e02233dc0ca6bd6d6a100590c..5921db86547f196d4c94f33f5ead1b42903268de 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -242,7 +242,7 @@ static void efuse_read_phymap_from_txpktbuf(
                while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG)) &&
                       (passing_time = rtw_get_passing_time_ms(start)) < 1000) {
                        DBG_88E("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, rtw_read8(adapter, 0x106));
-                       rtw_usleep_os(100);
+                       msleep(1);
                }
 
                lo32 = rtw_read32(adapter, REG_PKTBUF_DBG_DATA_L);
@@ -372,7 +372,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len)
        if (pbuf) {
                for (addr = 0; addr < data_cnts; addr++) {
                        rtw_write32(Adapter, 0x140, addr);
-                       rtw_usleep_os(2);
+                       msleep(1);
                        loop = 0;
                        do {
                                rstatus = (reg_140 = rtw_read32(Adapter, REG_PKTBUF_DBG_CTRL)&BIT24);
@@ -383,7 +383,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len)
                                        fifo_data = rtw_read32(Adapter, REG_PKTBUF_DBG_DATA_H);
                                        memcpy(pbuf+(addr*8+4), &fifo_data, 4);
                                }
-                               rtw_usleep_os(2);
+                               msleep(1);
                        } while (!rstatus && (loop++ < 10));
                }
                rtw_IOL_cmd_buf_dump(Adapter, data_len, pbuf);

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c b/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
index ec4fb02392d045982760cb4d5720d7c01dbe79aa..e5dc0361092e47f8fa215a40e88c1c27de73f996 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
@@ -663,18 +663,18 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart)
 
                if (is92C) {
                        _write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT19, 0x01);
-                       rtw_usleep_os(100);
+                       msleep(1);
                        if (rfPath == RF_PATH_A)
                                write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x10000); /*  PAD all on. */
                        else if (rfPath == RF_PATH_B)
                                write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x10000); /*  PAD all on. */
                        write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /*  PAD all on. */
-                       rtw_usleep_os(100);
+                       msleep(1);
                } else {
                        write_rfreg(pAdapter, rfPath, 0x21, 0xd4000);
-                       rtw_usleep_os(100);
+                       msleep(1);
                        write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /*  PAD all on. */
-                       rtw_usleep_os(100);
+                       msleep(1);
                }
 
                /* for dynamic set Power index. */
@@ -696,15 +696,15 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart)
                write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x1);
                if (is92C) {
                        _write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT19, 0x00);
-                       rtw_usleep_os(100);
+                       msleep(1);
                        write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x32d75); /*  PAD all on. */
                        write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x32d75); /*  PAD all on. */
-                       rtw_usleep_os(100);
+                       msleep(1);
                } else {
                        write_rfreg(pAdapter, rfPath, 0x21, 0x54000);
-                       rtw_usleep_os(100);
+                       msleep(1);
                        write_rfreg(pAdapter, rfPath, 0x00, 0x30000); /*  PAD all on. */
-                       rtw_usleep_os(100);
+                       msleep(1);
                }
 
                /* Stop for dynamic set Power index. */

diff --git a/drivers/staging/rtl8188eu/include/odm_interface.h b/drivers/staging/rtl8188eu/include/odm_interface.h
index 5e05d9e8a299a70d0ba1e2337aa7681aa99dac6e..c088c855abcf02b63227f57c1cd94850636d79a2 100644 (file)
--- a/drivers/staging/rtl8188eu/include/odm_interface.h
+++ b/drivers/staging/rtl8188eu/include/odm_interface.h
@@ -135,8 +135,6 @@ void ODM_ScheduleWorkItem(void *pRtWorkItem);
 void ODM_IsWorkItemScheduled(void *pRtWorkItem);
 
 /*  ODM Timer relative API. */
-void ODM_sleep_us(u32 us);
-
 void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
                  u32 msDelay);
 

diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h b/drivers/staging/rtl8188eu/include/osdep_service.h
index 6085181c812668dab02236fa9095fd6a61b55d89..818bb9164b66116e726e3f20bc7df5f9a5d14795 100644 (file)
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -275,8 +275,6 @@ s32  rtw_get_time_interval_ms(u32 start, u32 end);
 
 void rtw_sleep_schedulable(int ms);
 
-void rtw_usleep_os(int us);
-
 u32  rtw_atoi(u8 *s);
 
 void rtw_yield_os(void);

diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index e62f120e92463ab8f1ee2d9caed86dd1ccb718bf..aedc0164f9538a512aa2afeffc3aa1c187485ca4 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -245,14 +245,6 @@ void rtw_sleep_schedulable(int ms)
                return;
 }
 
-void rtw_usleep_os(int us)
-{
-       if (1 < (us/1000))
-               msleep(1);
-       else
-               msleep((us/1000) + 1);
-}
-
 void rtw_yield_os(void)
 {
        yield();