diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2021-11-25 19:25:12 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-25 19:47:18 +0300 |
| commit | 84c365f8ff8fc93a34d6cabe780d0b0f49c177e2 (patch) | |
| tree | 7903ce0069a6a69b8053a40d0375e470196d56a5 /drivers/staging | |
| parent | 05b57e8c91ca5cf2af112c1a30ca97446f084232 (diff) | |
| download | linux-84c365f8ff8fc93a34d6cabe780d0b0f49c177e2.tar.xz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/r8188eu/core/rtw_cmd.c | 2 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/core/rtw_led.c | 2 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/include/osdep_service.h | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c index fb8ba7ded489..d0a61331b883 100644 --- 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 0aebdc3c497d..ae46fd48f940 100644 --- 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 21e5cacbd893..5d8b567a3165 100644 --- 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. */ /* */ |