Commit 54ae9f0f authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

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: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4898e78
...@@ -103,22 +103,27 @@ void r8712_free_cmd_priv(struct cmd_priv *pcmdpriv) ...@@ -103,22 +103,27 @@ void r8712_free_cmd_priv(struct cmd_priv *pcmdpriv)
/* /*
* Calling Context: * 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. * since only spin_lock is used.
* *
* ISR/Call-Back functions can't call this sub-function. * 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; unsigned long irqL;
if (pcmdpriv->padapter->eeprompriv.bautoload_fail_flag)
return;
if (!obj) if (!obj)
return; return;
queue = &pcmdpriv->cmd_queue;
spin_lock_irqsave(&queue->lock, irqL); spin_lock_irqsave(&queue->lock, irqL);
list_add_tail(&obj->list, &queue->queue); list_add_tail(&obj->list, &queue->queue);
spin_unlock_irqrestore(&queue->lock, irqL); spin_unlock_irqrestore(&queue->lock, irqL);
complete(&pcmdpriv->cmd_queue_comp);
} }
static struct cmd_obj *_dequeue_cmd(struct __queue *queue) static struct cmd_obj *_dequeue_cmd(struct __queue *queue)
...@@ -135,14 +140,6 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue) ...@@ -135,14 +140,6 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue)
return obj; 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) void r8712_enqueue_cmd_ex(struct cmd_priv *pcmdpriv, struct cmd_obj *obj)
{ {
unsigned long irqL; unsigned long irqL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment