staging: rtl8712: recv_indicatepkt_reorder(): Change return values

Change return values of recv_indicatepkt_reorder from _SUCCESS/_FAIL to
0/-ENOMEM and -EINVAL.
Within recv_indicatepkt_reorder, modify comparison to true and use the
respective value directly.
Modify call site of recv_indicatepkt_reorder to check for the new return
values.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190808064012.12661-2-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index 42372e7e76ac60bad453928b23eed58517341cbd..3950b2424b6419e23685e6a0c039f2d00ce3803e 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -569,9 +569,9 @@ static int recv_indicatepkt_reorder(struct _adapter *padapter,
                        if (!padapter->driver_stopped &&
                            !padapter->surprise_removed) {
                                r8712_recv_indicatepkt(padapter, prframe);
-                               return _SUCCESS;
+                               return 0;
                        } else {
-                               return _FAIL;
+                               return -EINVAL;
                        }
                }
        }
@@ -593,8 +593,7 @@ static int recv_indicatepkt_reorder(struct _adapter *padapter,
         * 2. All packets with SeqNum larger than or equal to
         * WinStart => Buffer it.
         */
-       if (r8712_recv_indicatepkts_in_order(padapter, preorder_ctrl, false) ==
-           true) {
+       if (r8712_recv_indicatepkts_in_order(padapter, preorder_ctrl, false)) {
                mod_timer(&preorder_ctrl->reordering_ctrl_timer,
                          jiffies + msecs_to_jiffies(REORDER_WAIT_TIME));
                spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
@@ -602,10 +601,10 @@ static int recv_indicatepkt_reorder(struct _adapter *padapter,
                spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
                del_timer(&preorder_ctrl->reordering_ctrl_timer);
        }
-       return _SUCCESS;
+       return 0;
 _err_exit:
        spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
-       return _FAIL;
+       return -ENOMEM;
 }
 
 void r8712_reordering_ctrl_timeout_handler(void *pcontext)
@@ -631,7 +630,7 @@ static int r8712_process_recv_indicatepkts(struct _adapter *padapter,
        struct ht_priv  *phtpriv = &pmlmepriv->htpriv;
 
        if (phtpriv->ht_option == 1) { /*B/G/N Mode*/
-               if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) {
+               if (recv_indicatepkt_reorder(padapter, prframe)) {
                        /* including perform A-MPDU Rx Ordering Buffer Control*/
                        if (!padapter->driver_stopped &&
                            !padapter->surprise_removed)