staging: r8188eu: remove the _cancel_workitem_sync wrapper

Remove the _cancel_workitem_sync wrapper and call
cancel_work_sync directly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211125162513.25039-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index fb8ba7ded489f8c1475f9608061e63eb63f1b586..d0a61331b8839e6575d3d36c9183bc262d5e4053 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -78,7 +78,7 @@ static int _rtw_init_evt_priv(struct evt_priv *pevtpriv)
 
 void rtw_free_evt_priv(struct  evt_priv *pevtpriv)
 {
-       _cancel_workitem_sync(&pevtpriv->c2h_wk);
+       cancel_work_sync(&pevtpriv->c2h_wk);
        while (pevtpriv->c2h_wk_alive)
                msleep(10);
 

diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c
index 0aebdc3c497d3b050c112ddbf28427498728f5e7..ae46fd48f940da1c7bf332af777fc14849127a47 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_led.c
+++ b/drivers/staging/r8188eu/core/rtw_led.c
@@ -51,7 +51,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed, enum LED_PIN_8
 
 void DeInitLed871x(struct LED_871x *pLed)
 {
-       _cancel_workitem_sync(&pLed->BlinkWorkItem);
+       cancel_work_sync(&pLed->BlinkWorkItem);
        _cancel_timer_ex(&pLed->BlinkTimer);
        ResetLedStatus(pLed);
 }

diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index 21e5cacbd8938d1eeae6d9c48bcb96c55baf03fe..5d8b567a3165d77ba3beb1ad1342144cb52c9798 100644 (file)
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -74,10 +74,6 @@ static inline void _cancel_timer(struct timer_list *ptimer,u8 *bcancelled)
 #define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl
 #define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)
 
-static inline void _cancel_workitem_sync(struct work_struct *pwork)
-{
-       cancel_work_sync(pwork);
-}
 /*  */
 /*  Global Mutex: can only be used at PASSIVE level. */
 /*  */