From 1875be81b5a86e1d83bbb624e3613eb2644cb9e3 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Thu, 25 Nov 2021 17:25:10 +0100 Subject: staging: r8188eu: remove the _set_workitem wrapper Remove the _set_workitem wrapper and call schedule_work directly. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20211125162513.25039-2-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/include/osdep_service.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/staging/r8188eu/include/osdep_service.h') diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h index f6f5e4581212..766440461a0c 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -79,11 +79,6 @@ static inline void _init_workitem(struct work_struct *pwork, void *pfunc, void * INIT_WORK(pwork, pfunc); } -static inline void _set_workitem(struct work_struct *pwork) -{ - schedule_work(pwork); -} - static inline void _cancel_workitem_sync(struct work_struct *pwork) { cancel_work_sync(pwork); -- cgit From 05b57e8c91ca5cf2af112c1a30ca97446f084232 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Thu, 25 Nov 2021 17:25:11 +0100 Subject: staging: r8188eu: remove the _init_workitem wrapper Remove the _init_workitem wrapper and call INIT_WORK directly. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20211125162513.25039-3-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/include/osdep_service.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/staging/r8188eu/include/osdep_service.h') diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h index 766440461a0c..21e5cacbd893 100644 --- 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); -- cgit From 84c365f8ff8fc93a34d6cabe780d0b0f49c177e2 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Thu, 25 Nov 2021 17:25:12 +0100 Subject: 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 Link: https://lore.kernel.org/r/20211125162513.25039-4-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/include/osdep_service.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/staging/r8188eu/include/osdep_service.h') 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. */ /* */ -- cgit From bcb898c690a8040963167c6c1d178e513474e43d Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sun, 5 Dec 2021 16:12:44 +0100 Subject: staging: r8188eu: remove two unused macros Remove two unused macros that increment and decrement a "mutex counter". Acked-by: Michael Straube Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20211205151251.6861-4-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/include/osdep_service.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'drivers/staging/r8188eu/include/osdep_service.h') diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h index 5d8b567a3165..6c8241372a06 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -74,24 +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) -/* */ -/* Global Mutex: can only be used at PASSIVE level. */ -/* */ - -#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \ -{ \ - while (atomic_inc_return((atomic_t *)&(_MutexCounter)) != 1)\ - { \ - atomic_dec((atomic_t *)&(_MutexCounter)); \ - msleep(10); \ - } \ -} - -#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \ -{ \ - atomic_dec((atomic_t *)&(_MutexCounter)); \ -} - static inline int rtw_netif_queue_stopped(struct net_device *pnetdev) { return netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 0)) && -- cgit