From: James A Shackleford Date: Wed, 9 Jul 2014 19:26:23 +0000 (-0400) Subject: staging: rtl8712: remove wrapper function thread_enter() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fee51243ee16e824742698903773f26e1ea48df1;p=deliverable%2Flinux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index c80f00683b0f..d7a357b8d2d1 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 61519774a25e..ab0c7eb248d3 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;