From: Nishka Dasgupta Date: Thu, 20 Jun 2019 11:52:59 +0000 (+0530) Subject: staging: rtl8712: Change (r8712)_enqueue_cmd to void X-Git-Tag: v5.3-rc1~126^2~202 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=29de098b330fb57da030819618635c619f5a0066;p=linux.git staging: rtl8712: Change (r8712)_enqueue_cmd to void Change the return types of r8712_enqueue_cmd to void as the return value of r8712_enqueue_cmd is never stored, checked, or otherwise used. Also change the return type of _enqueue_cmd to void as it is only called by r8712_enqueue_cmd which does not do anything with the return value except return it itself. Modify return statements in both functions accordingly. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index 9cc6a370102b..74a351788c2a 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -110,16 +110,15 @@ static void _free_cmd_priv(struct cmd_priv *pcmdpriv) * */ -static sint _enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) +static void _enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) { unsigned long irqL; if (!obj) - return _SUCCESS; + return; spin_lock_irqsave(&queue->lock, irqL); list_add_tail(&obj->list, &queue->queue); spin_unlock_irqrestore(&queue->lock, irqL); - return _SUCCESS; } static struct cmd_obj *_dequeue_cmd(struct __queue *queue) @@ -156,15 +155,12 @@ void r8712_free_cmd_priv(struct cmd_priv *pcmdpriv) _free_cmd_priv(pcmdpriv); } -u32 r8712_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj) +void r8712_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj) { - int res; - if (pcmdpriv->padapter->eeprompriv.bautoload_fail_flag) - return _FAIL; - res = _enqueue_cmd(&pcmdpriv->cmd_queue, obj); + return; + _enqueue_cmd(&pcmdpriv->cmd_queue, obj); complete(&pcmdpriv->cmd_queue_comp); - return res; } u32 r8712_enqueue_cmd_ex(struct cmd_priv *pcmdpriv, struct cmd_obj *obj) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h index 7d4da8ea95ec..2e30c359e0a2 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h @@ -79,7 +79,7 @@ do {\ pcmd->rspsz = 0;\ } while (0) -u32 r8712_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); +void r8712_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); u32 r8712_enqueue_cmd_ex(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); struct cmd_obj *r8712_dequeue_cmd(struct __queue *queue); void r8712_free_cmd_obj(struct cmd_obj *pcmd);