staging: r8188eu: correct error logic of _rtw_init_recv_priv()

Convert the function _rtw_init_recv_priv() away from returning _FAIL
and _SUCCESS, which uses inverted error logic. Return 0 for success
and negative values for failure instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230205080559.8319-3-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 70d43c10e53d87ff593ac3d37725851578b835a5..fc7568cf948b8c549fe1653f662d007997a401dd 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -99,10 +99,8 @@ static int rtl8188eu_init_recv_priv(struct adapter *padapter)
 int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 {
        int i;
-
        struct recv_frame *precvframe;
-
-       int     res = _SUCCESS;
+       int err;
 
        spin_lock_init(&precvpriv->lock);
 
@@ -115,11 +113,8 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
        precvpriv->free_recvframe_cnt = NR_RECVFRAME;
 
        precvpriv->pallocated_frame_buf = vzalloc(NR_RECVFRAME * sizeof(struct recv_frame) + RXFRAME_ALIGN_SZ);
-
-       if (!precvpriv->pallocated_frame_buf) {
-               res = _FAIL;
-               goto exit;
-       }
+       if (!precvpriv->pallocated_frame_buf)
+               return -ENOMEM;
 
        precvpriv->precv_frame_buf = (u8 *)ALIGN((size_t)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ);
 
@@ -139,16 +134,14 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
        }
        precvpriv->rx_pending_cnt = 1;
 
-       if (rtl8188eu_init_recv_priv(padapter))
-               res = _FAIL;
+       err = rtl8188eu_init_recv_priv(padapter);
 
        timer_setup(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl, 0);
        precvpriv->signal_stat_sampling_interval = 1000; /* ms */
 
        rtw_set_signal_stat_timer(precvpriv);
-exit:
 
-       return res;
+       return err;
 }
 
 static void rtl8188eu_free_recv_priv(struct adapter *padapter)

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index cfc24420e70c69dbee5c0adda5e423b89252f120..4130e8fe29522136b89221df1e56fe868d932153 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -482,7 +482,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
                goto free_mlme_ext;
        }
 
-       if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL) {
+       if (_rtw_init_recv_priv(&padapter->recvpriv, padapter)) {
                dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_recv_priv failed\n");
                goto free_xmit_priv;
        }