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

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

rtl8188eu: Replace semaphore terminate_cmdthread_sema with completion 



The semaphore 'terminate_cmdthread_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 c84f5e28

drivers/staging/rtl8188eu/core/rtw_cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ No irqsave is necessary. 
int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

{

	init_completion(&pcmdpriv->cmd_queue_comp);

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

	init_completion(&pcmdpriv->terminate_cmdthread_comp);



	_rtw_init_queue(&(pcmdpriv->cmd_queue));

	return _SUCCESS;
@@ -162,7 +162,7 @@ int rtw_cmd_thread(void *context) 
	allow_signal(SIGTERM);



	pcmdpriv->cmdthd_running = true;

	up(&pcmdpriv->terminate_cmdthread_sema);

	complete(&pcmdpriv->terminate_cmdthread_comp);



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x rtw_cmd_thread !!!!\n"));
@@ -234,7 +234,7 @@ int rtw_cmd_thread(void *context) 
		rtw_free_cmd_obj(pcmd);

	}



	up(&pcmdpriv->terminate_cmdthread_sema);

	complete(&pcmdpriv->terminate_cmdthread_comp);





	complete_and_exit(NULL, 0);

drivers/staging/rtl8188eu/include/rtw_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct cmd_obj { 


struct cmd_priv {

	struct completion cmd_queue_comp;

	struct semaphore terminate_cmdthread_sema;

	struct completion terminate_cmdthread_comp;

	struct __queue cmd_queue;

	u8 cmdthd_running;

	struct adapter *padapter;

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+2 −2
Original line number Diff line number Diff line
@@ -762,7 +762,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);

		wait_for_completion_interruptible(&padapter->cmdpriv.terminate_cmdthread_comp);



	return err;

}
@@ -774,7 +774,7 @@ void rtw_stop_drv_threads(struct adapter *padapter) 
	/* Below is to terminate rtw_cmd_thread & event_thread... */

	complete(&padapter->cmdpriv.cmd_queue_comp);

	if (padapter->cmdThread)

		_rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);

		wait_for_completion_interruptible(&padapter->cmdpriv.terminate_cmdthread_comp);



}