{
        u8      ret8 = _SUCCESS;
 
-       if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) {
-               ret8 = _FAIL;
-               goto exit;
-       }
+       if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL)
+               return _FAIL;
 
        padapter->cmdpriv.padapter = padapter;
 
-       if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) {
-               ret8 = _FAIL;
-               goto exit;
-       }
+       if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL)
+               return _FAIL;
 
-       if (rtw_init_mlme_priv(padapter) == _FAIL) {
-               ret8 = _FAIL;
-               goto exit;
-       }
+       if (rtw_init_mlme_priv(padapter) == _FAIL)
+               return _FAIL;
 
        rtw_init_wifidirect_timers(padapter);
        init_wifidirect_info(padapter, P2P_ROLE_DISABLE);
        reset_global_wifidirect_info(padapter);
 
-       if (init_mlme_ext_priv(padapter) == _FAIL) {
-               ret8 = _FAIL;
-               goto exit;
-       }
+       if (init_mlme_ext_priv(padapter) == _FAIL)
+               return _FAIL;
 
        if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) {
                DBG_88E("Can't _rtw_init_xmit_priv\n");
-               ret8 = _FAIL;
-               goto exit;
+               return _FAIL;
        }
 
        if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL) {
                DBG_88E("Can't _rtw_init_recv_priv\n");
-               ret8 = _FAIL;
-               goto exit;
+               return _FAIL;
        }
 
        if (_rtw_init_sta_priv(&padapter->stapriv) == _FAIL) {
                DBG_88E("Can't _rtw_init_sta_priv\n");
-               ret8 = _FAIL;
-               goto exit;
+               return _FAIL;
        }
 
        padapter->stapriv.padapter = padapter;
 
        spin_lock_init(&padapter->br_ext_lock);
 
-exit:
        return ret8;
 }