Re: [PATCH RESEND 14/16] staging: rtl8188eu: remove _rtw_down_sema()

[Larry Finger <Larry.Finger@xxxxxxxxxxxx>]

On 08/28/2015 03:45 PM, Luca Ceresoli wrote:
> It's just a wrapper tp down_interruptible().

Typo in line above and see compile warnings below:

Larry

> Signed-off-by: Luca Ceresoli <luca@xxxxxxxxxxxxxxxx>
> Cc: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxx>
> ---
>   drivers/staging/rtl8188eu/core/rtw_cmd.c          | 2 +-
>   drivers/staging/rtl8188eu/include/osdep_service.h | 2 --
>   drivers/staging/rtl8188eu/include/rtw_pwrctrl.h   | 2 +-
>   drivers/staging/rtl8188eu/os_dep/os_intfs.c       | 4 ++--
>   drivers/staging/rtl8188eu/os_dep/osdep_service.c  | 8 --------
>   5 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> index 21b0244031dd..e5d8606e37c4 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> @@ -378,7 +378,7 @@ int rtw_cmd_thread(void *context)
>   	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x rtw_cmd_thread !!!!\n"));
>
>   	while (1) {
> -		if (_rtw_down_sema(&pcmdpriv->cmd_queue_sema) == _FAIL)
> +		if (down_interruptible(&pcmdpriv->cmd_queue_sema))
>   			break;
>
>   		if (padapter->bDriverStopped ||
> diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h b/drivers/staging/rtl8188eu/include/osdep_service.h
> index cf9ca685eb77..77c075b1be0a 100644
> --- a/drivers/staging/rtl8188eu/include/osdep_service.h
> +++ b/drivers/staging/rtl8188eu/include/osdep_service.h
> @@ -131,8 +131,6 @@ u8 *_rtw_malloc(u32 sz);
>
>   void *rtw_malloc2d(int h, int w, int size);
>
> -u32  _rtw_down_sema(struct semaphore *sema);
> -
>   void _rtw_init_queue(struct __queue *pqueue);
>
>   s32  rtw_get_passing_time_ms(u32 start);
> diff --git a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
> index a493d4c37ef1..70a602de4ae5 100644
> --- a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
> +++ b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
> @@ -104,7 +104,7 @@ static inline void _init_pwrlock(struct semaphore  *plock)
>
>   static inline void _enter_pwrlock(struct semaphore  *plock)
>   {
> -	_rtw_down_sema(plock);
> +	down_interruptible(plock);

The return from down_interruptible() needs to be checked, otherwise you get 
warnings such as the following:

  CC [M]  drivers/staging/rtl8188eu/os_dep/xmit_linux.o
drivers/staging/rtl8188eu/os_dep/os_intfs.c: In function ‘rtw_start_drv_threads’:
drivers/staging/rtl8188eu/os_dep/os_intfs.c:767:21: warning: ignoring return 
value of ‘down_interruptible’, declared with attribute warn_unused_result 
[-Wunused-result]
   down_interruptible(&padapter->cmdpriv.terminate_cmdthread_sema);
                     ^
These occur every place _exit_pwrlock() is called.


>   }
>
>   static inline void _exit_pwrlock(struct semaphore  *plock)
> diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
> index 6ec881952029..e10502eb9e48 100644
> --- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
> @@ -764,7 +764,7 @@ static int rtw_start_drv_threads(struct adapter *padapter)
>   		err = PTR_ERR(padapter->cmdThread);
>   	else
>   		/* wait for cmd_thread to run */
> -		_rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);
> +		down_interruptible(&padapter->cmdpriv.terminate_cmdthread_sema);
>
>   	return err;
>   }
> @@ -776,7 +776,7 @@ void rtw_stop_drv_threads(struct adapter *padapter)
>   	/* Below is to terminate rtw_cmd_thread & event_thread... */
>   	up(&padapter->cmdpriv.cmd_queue_sema);
>   	if (padapter->cmdThread)
> -		_rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);
> +		down_interruptible(&padapter->cmdpriv.terminate_cmdthread_sema);
>
>   }
>
> diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
> index acb4eb120b76..73ddcc8442e7 100644
> --- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
> +++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
> @@ -63,14 +63,6 @@ void *rtw_malloc2d(int h, int w, int size)
>   	return a;
>   }
>
> -u32 _rtw_down_sema(struct semaphore *sema)
> -{
> -	if (down_interruptible(sema))
> -		return _FAIL;
> -	else
> -		return _SUCCESS;
> -}
> -
>   void	_rtw_init_queue(struct __queue *pqueue)
>   {
>   	INIT_LIST_HEAD(&(pqueue->queue));

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel