staging: rtl8712: r8712_init_mlme_priv(): Change return values

Change return values of r8712_init_mlme_priv from _SUCCESS/_FAIL to
0/-ENOMEM respectively. Modify call site accordingly.

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

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index b554cf8bd679a430ba1932751a8e95a3b76b8a26..b4059ea17e5c407560638913a92e66de17cf3cb8 100644 (file)
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -302,7 +302,7 @@ u8 r8712_init_drv_sw(struct _adapter *padapter)
        padapter->cmdpriv.padapter = padapter;
        if (r8712_init_evt_priv(&padapter->evtpriv))
                return _FAIL;
-       if (r8712_init_mlme_priv(padapter) == _FAIL)
+       if (r8712_init_mlme_priv(padapter))
                return _FAIL;
        _r8712_init_xmit_priv(&padapter->xmitpriv, padapter);
        _r8712_init_recv_priv(&padapter->recvpriv, padapter);

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 0cc879a4d43fa19446a33fa428afe728e5a6ad06..a4922af61acdc1326bdcd6efa36d6590de053716 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -53,7 +53,7 @@ int r8712_init_mlme_priv(struct _adapter *padapter)
        pbuf = kmalloc_array(MAX_BSS_CNT, sizeof(struct wlan_network),
                             GFP_ATOMIC);
        if (!pbuf)
-               return _FAIL;
+               return -ENOMEM;
        pmlmepriv->free_bss_buf = pbuf;
        pnetwork = (struct wlan_network *)pbuf;
        for (i = 0; i < MAX_BSS_CNT; i++) {
@@ -67,7 +67,7 @@ int r8712_init_mlme_priv(struct _adapter *padapter)
        pmlmepriv->sitesurveyctrl.traffic_busy = false;
        /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
        r8712_init_mlme_timer(padapter);
-       return _SUCCESS;
+       return 0;
 }
 
 struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv)