Commit 11d5fd31 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: convert all rtw_zvmalloc calls to vzalloc calls 



Convert all rtw_zvmalloc calls within the driver to use the existing
kernel vzalloc function, which has the same semantics. Also rewrite the
two places where it is mentioned in comments to say vzalloc, and remove
the redundant cast to struct adapter * in ./os_dep/usb_intf.c as vzalloc
returns void *.

The reason for the conversion is that rtw_zvmalloc is just a
preprocessor definition for _rtw_zvmalloc which itself is just an inline
wrapper around vmalloc which then zeroes the memory out. As vzalloc does
the same thing via usage of __GFP_ZERO, this code is redundant and can
subsequently be removed.

Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210818234853.208448-5-phil@philpotter.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c29e42af

drivers/staging/r8188eu/core/rtw_mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ int _rtw_init_mlme_priv(struct adapter *padapter) 
	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	int	res = _SUCCESS;



	/*  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;
@@ -55,7 +55,7 @@ int _rtw_init_mlme_priv(struct adapter *padapter) 


	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) {

		res = _FAIL;

drivers/staging/r8188eu/core/rtw_mp.c

+1 −1
Original line number Diff line number Diff line
@@ -930,7 +930,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) {

		res = _FAIL;

drivers/staging/r8188eu/core/rtw_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) 


	rtw_os_recv_resource_init(precvpriv, padapter);



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

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



	if (!precvpriv->pallocated_frame_buf) {

		res = _FAIL;

drivers/staging/r8188eu/core/rtw_sta_mgt.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) 
	struct sta_info *psta;

	s32 i;



	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/r8188eu/core/rtw_xmit.c

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;

	u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;



	/*  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);
@@ -72,7 +72,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	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) {

		pxmitpriv->pxmit_frame_buf = NULL;
@@ -109,7 +109,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	_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) {

		res = _FAIL;
@@ -150,7 +150,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	/*  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) {

		res = _FAIL;