Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c84f5e28 authored by Binoy Jayan's avatar Binoy Jayan Committed by Greg Kroah-Hartman
Browse files

rtl8188eu: Replace semaphore cmd_queue_sema with completion 



The semaphore 'cmd_queue_sema' is used as completion,
so convert it to struct completion.

Signed-off-by: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95d2a324

drivers/staging/rtl8188eu/core/rtw_cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ No irqsave is necessary. 


int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

{

	sema_init(&(pcmdpriv->cmd_queue_sema), 0);

	init_completion(&pcmdpriv->cmd_queue_comp);

	sema_init(&(pcmdpriv->terminate_cmdthread_sema), 0);



	_rtw_init_queue(&(pcmdpriv->cmd_queue));
@@ -122,7 +122,7 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) 
	res = _rtw_enqueue_cmd(&pcmdpriv->cmd_queue, cmd_obj);



	if (res == _SUCCESS)

		up(&pcmdpriv->cmd_queue_sema);

		complete(&pcmdpriv->cmd_queue_comp);



exit:
@@ -167,7 +167,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 (wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp))

			break;



		if (padapter->bDriverStopped ||

drivers/staging/rtl8188eu/include/rtw_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct cmd_obj { 
};



struct cmd_priv {

	struct semaphore cmd_queue_sema;

	struct completion cmd_queue_comp;

	struct semaphore terminate_cmdthread_sema;

	struct __queue cmd_queue;

	u8 cmdthd_running;

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ void rtw_stop_drv_threads(struct adapter *padapter) 
	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n"));



	/* Below is to terminate rtw_cmd_thread & event_thread... */

	up(&padapter->cmdpriv.cmd_queue_sema);

	complete(&padapter->cmdpriv.cmd_queue_comp);

	if (padapter->cmdThread)

		_rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);