staging: r8188eu: Remove wrapper rtw_mdelay_os()

This wrapper just calls mdelay(). Remove it.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Link: https://lore.kernel.org/r/20210805192644.15978-3-Larry.Finger@lwfinger.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mp.c b/drivers/staging/r8188eu/core/rtw_mp.c
index 76db563d396991f87c6440beb5beb79bb54eb5a3..252d5c37d81378c676a4357a797734ad238673f3 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mp.c
+++ b/drivers/staging/r8188eu/core/rtw_mp.c
@@ -840,11 +840,11 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point)
        psd_val |= point;
 
        rtw_write32(pAdapter, 0x808, psd_val);
-       rtw_mdelay_os(1);
+       mdelay(1);
        psd_val |= 0x00400000;
 
        rtw_write32(pAdapter, 0x808, psd_val);
-       rtw_mdelay_os(1);
+       mdelay(1);
        psd_val = rtw_read32(pAdapter, 0x8B4);
 
        psd_val &= 0x0000FFFF;

diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index d39556d4a3472c5d183243ffe84e0268e8fd2533..a64eeb5ae2e29add717159706f59eedd18d5651c 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -137,7 +137,7 @@ void ODM_StallExecution(u32 usDelay)
 
 void ODM_delay_ms(u32 ms)
 {
-       rtw_mdelay_os(ms);
+       mdelay(ms);
 }
 
 void ODM_delay_us(u32 us)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c b/drivers/staging/r8188eu/hal/rtl8188e_cmd.c
index be41e370096904c21df130903fe182e88a22d3ba..712307bc674f3052f867dca53c656af0b2e6cd35 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_cmd.c
@@ -626,7 +626,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
                        DLBcnCount++;
                        do {
                                yield();
-                               /* rtw_mdelay_os(10); */
+                               /* mdelay(10); */
                                /*  check rsvd page download OK. */
                                rtw_hal_get_hwreg(adapt, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid));
                                poll++;

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index c2d9c0359e647f570062c9798ca037e9ce4f8ee8..6ecadba1796397a43126ea6f375e065f05834ad6 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1846,7 +1846,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                                /* RQPN Load 0 */
                                rtw_write16(Adapter, REG_RQPN_NPQ, 0x0);
                                rtw_write32(Adapter, REG_RQPN, 0x80000000);
-                               rtw_mdelay_os(10);
+                               mdelay(10);
                        }
                }
                break;

diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index 5b83f2efd94c749e7669c98e91242a3ffe33b3b6..16d6df7027888a4d4515578b9d38ef7f62defe45 100644 (file)
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -236,7 +236,6 @@ void rtw_usleep_os(int us);
 
 u32  rtw_atoi(u8 *s);
 
-void rtw_mdelay_os(int ms);
 void rtw_udelay_os(int us);
 
 static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer)

diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/staging/r8188eu/os_dep/osdep_service.c
index a29d10f281e977fce5da09583e6ddd5d5e4c7483..99497bb11e0b50634c5df5fbfbb034a29cc495e1 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/r8188eu/os_dep/osdep_service.c
@@ -141,11 +141,6 @@ void rtw_usleep_os(int us)
                msleep((us/1000) + 1);
 }
 
-void rtw_mdelay_os(int ms)
-{
-       mdelay((unsigned long)ms);
-}
-
 void rtw_udelay_os(int us)
 {
        udelay((unsigned long)us);