staging: r8188eu: remove the _init_workitem wrapper

Remove the _init_workitem wrapper and call INIT_WORK directly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211125162513.25039-3-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 1f4cc321bd1a42c17b2b097bb53f9f8bc31bfee6..fb8ba7ded489f8c1475f9608061e63eb63f1b586 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -69,7 +69,7 @@ static int _rtw_init_evt_priv(struct evt_priv *pevtpriv)
        atomic_set(&pevtpriv->event_seq, 0);
        pevtpriv->evt_done_cnt = 0;
 
-       _init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL);
+       INIT_WORK(&pevtpriv->c2h_wk, c2h_wk_callback);
        pevtpriv->c2h_wk_alive = false;
        pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN + 1);
 

diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c
index d48ed98453f542f7adea88def18712db91512fcf..0aebdc3c497d3b050c112ddbf28427498728f5e7 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_led.c
+++ b/drivers/staging/r8188eu/core/rtw_led.c
@@ -46,7 +46,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed, enum LED_PIN_8
        ResetLedStatus(pLed);
 
        timer_setup(&pLed->BlinkTimer, BlinkTimerCallback, 0);
-       _init_workitem(&pLed->BlinkWorkItem, BlinkWorkItemCallback, pLed);
+       INIT_WORK(&pLed->BlinkWorkItem, BlinkWorkItemCallback);
 }
 
 void DeInitLed871x(struct LED_871x *pLed)

diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index 766440461a0cf83e6e9b23e6f970970eb745acfb..21e5cacbd8938d1eeae6d9c48bcb96c55baf03fe 100644 (file)
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -74,11 +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 _init_workitem(struct work_struct *pwork, void *pfunc, void * cntx)
-{
-       INIT_WORK(pwork, pfunc);
-}
-
 static inline void _cancel_workitem_sync(struct work_struct *pwork)
 {
        cancel_work_sync(pwork);