diff options
| author |   Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-06-26 11:39:40 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-01 10:44:06 +0200 |
| commit | 54ae9f0fdad161e0f52fedbb373c145594975768 (patch) | |
| tree | 98964d086245b025ac24895318c838ccb218575a /drivers/staging/rtl8712/rtl871x_cmd.c | |
| parent | staging: rtl8712: r8712_xmit_resource_alloc(): Change return values (diff) | |
| download | linux-dev-54ae9f0fdad161e0f52fedbb373c145594975768.tar.xz linux-dev-54ae9f0fdad161e0f52fedbb373c145594975768.zip | |
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>
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_cmd.c')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_cmd.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index 436b5ee619e7..37cc18581e84 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -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; |