Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2397c6e0 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove wrappers around vmalloc and vzalloc 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d901c65

drivers/staging/rtl8188eu/core/rtw_mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int _rtw_init_mlme_priv (struct adapter *padapter) 


_func_enter_;



	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */

	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */



	pmlmepriv->nic_hdl = (u8 *)padapter;
@@ -62,7 +62,7 @@ _func_enter_; 


	_rtw_memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));



	pbuf = rtw_zvmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)));

	pbuf = vzalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)));



	if (pbuf == NULL) {

		res = _FAIL;

drivers/staging/rtl8188eu/core/rtw_mp.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv) 
	/*  Init xmit extension buff */

	_rtw_init_queue(&pxmitpriv->free_xmit_extbuf_queue);



	pxmitpriv->pallocated_xmit_extbuf = rtw_zvmalloc(num_xmit_extbuf * sizeof(struct xmit_buf) + 4);

	pxmitpriv->pallocated_xmit_extbuf = vzalloc(num_xmit_extbuf * sizeof(struct xmit_buf) + 4);



	if (pxmitpriv->pallocated_xmit_extbuf  == NULL) {

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_extbuf fail!\n"));

drivers/staging/rtl8188eu/core/rtw_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ _func_enter_; 


	rtw_os_recv_resource_init(precvpriv, padapter);



	precvpriv->pallocated_frame_buf = rtw_zvmalloc(NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ);

	precvpriv->pallocated_frame_buf = vzalloc(NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ);



	if (precvpriv->pallocated_frame_buf == NULL) {

		res = _FAIL;

drivers/staging/rtl8188eu/core/rtw_sta_mgt.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) 


_func_enter_;



	pstapriv->pallocated_stainfo_buf = rtw_zvmalloc(sizeof(struct sta_info) * NUM_STA + 4);

	pstapriv->pallocated_stainfo_buf = vzalloc(sizeof(struct sta_info) * NUM_STA + 4);



	if (!pstapriv->pallocated_stainfo_buf)

		return _FAIL;

drivers/staging/rtl8188eu/core/rtw_xmit.c

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 


_func_enter_;



	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */

	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */



	spin_lock_init(&pxmitpriv->lock);

	sema_init(&pxmitpriv->xmit_sema, 0);
@@ -91,7 +91,7 @@ _func_enter_; 
	Please also apply  free_txobj to link_up all the xmit_frames...

	*/



	pxmitpriv->pallocated_frame_buf = rtw_zvmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4);

	pxmitpriv->pallocated_frame_buf = vzalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4);



	if (pxmitpriv->pallocated_frame_buf  == NULL) {

		pxmitpriv->pxmit_frame_buf = NULL;
@@ -129,7 +129,7 @@ _func_enter_; 
	_rtw_init_queue(&pxmitpriv->free_xmitbuf_queue);

	_rtw_init_queue(&pxmitpriv->pending_xmitbuf_queue);



	pxmitpriv->pallocated_xmitbuf = rtw_zvmalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4);

	pxmitpriv->pallocated_xmitbuf = vzalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4);



	if (pxmitpriv->pallocated_xmitbuf  == NULL) {

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_buf fail!\n"));
@@ -171,7 +171,7 @@ _func_enter_; 
	/*  Init xmit extension buff */

	_rtw_init_queue(&pxmitpriv->free_xmit_extbuf_queue);



	pxmitpriv->pallocated_xmit_extbuf = rtw_zvmalloc(num_xmit_extbuf * sizeof(struct xmit_buf) + 4);

	pxmitpriv->pallocated_xmit_extbuf = vzalloc(num_xmit_extbuf * sizeof(struct xmit_buf) + 4);



	if (pxmitpriv->pallocated_xmit_extbuf  == NULL) {

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_extbuf fail!\n"));