OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8712: Replace function r8712_enqueue_cmd() 

Merge function _enqueue_cmd into function r8712_enqueue_cmd as
_enqueue_cmd is only called by r8712_enqueue_cmd, and then only once.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nishka Dasgupta 2019-06-26 11:39:40 +05:30 committed by Greg Kroah-Hartman
parent a4898e78c3
commit 54ae9f0fda
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/rtl8712/rtl871x_cmd.c
View File

@ -103,22 +103,27 @@ void r8712_free_cmd_priv(struct cmd_priv *pcmdpriv)
/*
* Calling Context:
*
* _enqueue_cmd can only be called between kernel thread,
* r8712_enqueue_cmd can only be called between kernel thread,
* since only spin_lock is used.
*
* ISR/Call-Back functions can't call this sub-function.
*
*/
static void _enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
void r8712_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj)
{
struct __queue *queue;
unsigned long irqL;
if (pcmdpriv->padapter->eeprompriv.bautoload_fail_flag)
return;
if (!obj)
return;
queue = &pcmdpriv->cmd_queue;
spin_lock_irqsave(&queue->lock, irqL);
list_add_tail(&obj->list, &queue->queue);
spin_unlock_irqrestore(&queue->lock, irqL);
complete(&pcmdpriv->cmd_queue_comp);
}
static struct cmd_obj *_dequeue_cmd(struct __queue *queue)
@ -135,14 +140,6 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue)
return obj;
}
void r8712_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj)
{
if (pcmdpriv->padapter->eeprompriv.bautoload_fail_flag)
return;
_enqueue_cmd(&pcmdpriv->cmd_queue, obj);
complete(&pcmdpriv->cmd_queue_comp);
}
void r8712_enqueue_cmd_ex(struct cmd_priv *pcmdpriv, struct cmd_obj *obj)
{
unsigned long irqL;