2014-07-09 19:26:36

by James A Shackleford

[permalink] [raw]
Subject: [PATCH] staging: rtl8712: remove wrapper function thread_enter()

The inline function thread_enter() accepts a single ignored parameter and is
just a wrapper for allow_signal(SIGTERM). Removed.

Signed-off-by: James A Shackleford <[email protected]>
---
drivers/staging/rtl8712/osdep_service.h | 5 -----
drivers/staging/rtl8712/rtl8712_cmd.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index c80f006..d7a357b 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -118,11 +118,6 @@ static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer)
return del_timer(ptimer);
}

-static inline void thread_enter(void *context)
-{
- allow_signal(SIGTERM);
-}
-
static inline void flush_signals_thread(void)
{
if (signal_pending(current))
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index 6151977..ab0c7eb 100644
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -326,7 +326,7 @@ int r8712_cmd_thread(void *context)
struct _adapter *padapter = (struct _adapter *)context;
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);

- thread_enter(padapter);
+ allow_signal(SIGTERM);
while (1) {
if ((_down_sema(&(pcmdpriv->cmd_queue_sema))) == _FAIL)
break;
--
1.9.1