staging: rtl8712: Change (r8712)_enqueue_cmd to void [Linux 5.3]

This Linux kernel change "staging: rtl8712: Change (r8712)_enqueue_cmd to void" is included in the Linux 5.3 release. This change is authored by Nishka Dasgupta <nishkadg.linux [at] gmail.com> on Thu Jun 20 17:22:59 2019 +0530. The commit for this change in Linux stable tree is 29de098 (patch).

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 <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

There are 16 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/staging/rtl8712/rtl871x_cmd.c | 14 +++++---------
 drivers/staging/rtl8712/rtl871x_cmd.h |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 9cc6a37..74a3517 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 7d4da8e..2e30c35 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.h
+++ b/drivers/staging/rtl8712/rtl871x_cmd.h
@@ -79,7 +79,7 @@ struct    evt_priv {
    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);

Leave a Reply

Your email address will not be published. Required fields are marked *