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

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

rtl8712: Replace semaphore cmd_queue_sema with completion 



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

Signed-off-by: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38bee763

drivers/staging/rtl8712/os_intfs.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static u32 start_drv_threads(struct _adapter *padapter) 
void r8712_stop_drv_threads(struct _adapter *padapter)

{

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

	up(&padapter->cmdpriv.cmd_queue_sema);

	complete(&padapter->cmdpriv.cmd_queue_comp);

	if (padapter->cmdThread)

		_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);

	padapter->cmdpriv.cmd_seq = 1;

drivers/staging/rtl8712/rtl8712_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int r8712_cmd_thread(void *context) 


	allow_signal(SIGTERM);

	while (1) {

		if ((_down_sema(&(pcmdpriv->cmd_queue_sema))) == _FAIL)

		if (wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp))

			break;

		if (padapter->bDriverStopped || padapter->bSurpriseRemoved)

			break;

drivers/staging/rtl8712/rtl871x_cmd.c

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


static sint _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);



	_init_queue(&(pcmdpriv->cmd_queue));
@@ -172,7 +172,7 @@ u32 r8712_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj) 
	if (pcmdpriv->padapter->eeprompriv.bautoload_fail_flag)

		return _FAIL;

	res = _enqueue_cmd(&pcmdpriv->cmd_queue, obj);

	up(&pcmdpriv->cmd_queue_sema);

	complete(&pcmdpriv->cmd_queue_comp);

	return res;

}
@@ -189,7 +189,7 @@ u32 r8712_enqueue_cmd_ex(struct cmd_priv *pcmdpriv, struct cmd_obj *obj) 
	spin_lock_irqsave(&queue->lock, irqL);

	list_add_tail(&obj->list, &queue->queue);

	spin_unlock_irqrestore(&queue->lock, irqL);

	up(&pcmdpriv->cmd_queue_sema);

	complete(&pcmdpriv->cmd_queue_comp);

	return _SUCCESS;

}

drivers/staging/rtl8712/rtl871x_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,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 cmd_seq;

drivers/staging/rtl8712/rtl871x_pwrctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void r8712_cpwm_int_hdl(struct _adapter *padapter, 
	pwrpriv->cpwm = (preportpwrstate->state) & 0xf;

	if (pwrpriv->cpwm >= PS_STATE_S2) {

		if (pwrpriv->alives & CMD_ALIVE)

			up(&(pcmdpriv->cmd_queue_sema));

			complete(&(pcmdpriv->cmd_queue_comp));

	}

	pwrpriv->cpwm_tog = (preportpwrstate->state) & 0x80;

	up(&pwrpriv->lock);