staging: r8188eu: convert rtw_init_mlme_priv() to common error logic

Convert the function rtw_init_mlme_priv() to common kernel error logic.
Return 0 on success and negative value on failure. This is part of
getting rid of returning _SUCCESS and _FAIL which uses inverted error
logic and is used all over the driver.

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

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 5ca03d6cac32a2f1b849bab76835321c46d4ee5c..1f69e5c57d5d596dbd2c5470a9617498e7e26d32 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -224,7 +224,6 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* struct   mlme_priv *pmlmepriv)
        u8      *pbuf;
        struct wlan_network     *pnetwork;
        struct mlme_priv                *pmlmepriv = &padapter->mlmepriv;
-       int     res = _SUCCESS;
 
        /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
 
@@ -245,10 +244,9 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* struct  mlme_priv *pmlmepriv)
 
        pbuf = vzalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)));
 
-       if (!pbuf) {
-               res = _FAIL;
-               goto exit;
-       }
+       if (!pbuf)
+               return -ENOMEM;
+
        pmlmepriv->free_bss_buf = pbuf;
 
        pnetwork = (struct wlan_network *)pbuf;
@@ -265,9 +263,7 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* struct   mlme_priv *pmlmepriv)
 
        rtw_init_mlme_timer(padapter);
 
-exit:
-
-       return res;
+       return 0;
 }
 
 void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 490e0c7dc0345cc879024a3829d1b919a0b67dfd..d8b8a5291e402f0bdf81de5f20beab443a346c01 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -473,7 +473,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
                goto free_cmd_priv;
        }
 
-       if (rtw_init_mlme_priv(padapter) == _FAIL) {
+       if (rtw_init_mlme_priv(padapter)) {
                dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_mlme_priv failed\n");
                goto free_evt_priv;
        }