leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: r8188eu: Remove wrapper around vfree

Browse Source 
This call is so simple that there is no need, or use, for a wrapper.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Link: https://lore.kernel.org/r/20210805183717.23007-3-Larry.Finger@lwfinger.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Larry Finger 2021-08-05 13:37:14 -05:00 committed by Greg Kroah-Hartman
parent 79f712ea99
commit 71f09c5ae9
11 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/r8188eu/core/rtw_mlme.c
View File

@ -129,9 +129,7 @@ void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
if (pmlmepriv) {
rtw_mfree_mlme_priv_lock (pmlmepriv);
if (pmlmepriv->free_bss_buf) {
rtw_vmfree(pmlmepriv->free_bss_buf, MAX_BSS_CNT * sizeof(struct wlan_network));
}
vfree(pmlmepriv->free_bss_buf);
}
}

3
drivers/staging/r8188eu/core/rtw_mp.c
View File

@ -922,8 +922,7 @@ void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv)
pxmitbuf++;
}
if (pxmitpriv->pallocated_xmit_extbuf)
rtw_vmfree(pxmitpriv->pallocated_xmit_extbuf, num_xmit_extbuf * sizeof(struct xmit_buf) + 4);
vfree(pxmitpriv->pallocated_xmit_extbuf);
if (padapter->registrypriv.mp_mode == 0) {
max_xmit_extbuf_size = 6000;

5
drivers/staging/r8188eu/core/rtw_recv.c
View File

@ -115,12 +115,9 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
rtw_os_recv_resource_free(precvpriv);
if (precvpriv->pallocated_frame_buf) {
rtw_vmfree(precvpriv->pallocated_frame_buf, NR_RECVFRAME * sizeof(struct recv_frame) + RXFRAME_ALIGN_SZ);
}
vfree(precvpriv->pallocated_frame_buf);
rtw_hal_free_recv_priv(padapter);
}
struct recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)

2
drivers/staging/r8188eu/core/rtw_sta_mgt.c
View File

@ -211,7 +211,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
rtw_mfree_sta_priv_lock(pstapriv);
if (pstapriv->pallocated_stainfo_buf)
rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info)*NUM_STA+4);
vfree(pstapriv->pallocated_stainfo_buf);
}
return _SUCCESS;

10
drivers/staging/r8188eu/core/rtw_xmit.c
View File

@ -252,11 +252,9 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
pxmitbuf++;
}
if (pxmitpriv->pallocated_frame_buf)
rtw_vmfree(pxmitpriv->pallocated_frame_buf, NR_XMITFRAME * sizeof(struct xmit_frame) + 4);
vfree(pxmitpriv->pallocated_frame_buf);
if (pxmitpriv->pallocated_xmitbuf)
rtw_vmfree(pxmitpriv->pallocated_xmitbuf, NR_XMITBUFF * sizeof(struct xmit_buf) + 4);
vfree(pxmitpriv->pallocated_xmitbuf);
/* free xmit extension buff */
_rtw_spinlock_free(&pxmitpriv->free_xmit_extbuf_queue.lock);
@ -267,9 +265,7 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
pxmitbuf++;
}
if (pxmitpriv->pallocated_xmit_extbuf) {
rtw_vmfree(pxmitpriv->pallocated_xmit_extbuf, num_xmit_extbuf * sizeof(struct xmit_buf) + 4);
}
vfree(pxmitpriv->pallocated_xmit_extbuf);
rtw_free_hwxmits(padapter);

2
drivers/staging/r8188eu/hal/odm_interface.c
View File

@ -85,7 +85,7 @@ void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 length)
/* length could be ignored, used to detect memory leakage. */
void ODM_FreeMemory(struct odm_dm_struct *pDM_Odm, void *pPtr, u32 length)
{
rtw_vmfree(pPtr, length);
vfree(pPtr);
}
s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2, u32 length)

2
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
View File

@ -363,7 +363,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len)
} while (!rstatus && (loop++ < 10));
}
rtw_IOL_cmd_buf_dump(Adapter, data_len, pbuf);
rtw_vmfree(pbuf, data_len+10);
vfree(pbuf);
}
DBG_88E("###### %s ######\n", __func__);
}

2
drivers/staging/r8188eu/include/osdep_service.h
View File

@ -214,10 +214,8 @@ extern unsigned char RSN_TKIP_CIPHER[4];
#define rtw_update_mem_stat(flag, sz) do {} while (0)
u8 *_rtw_vmalloc(u32 sz);
u8 *_rtw_zvmalloc(u32 sz);
void _rtw_vmfree(u8 *pbuf, u32 sz);
#define rtw_vmalloc(sz) _rtw_vmalloc((sz))
#define rtw_zvmalloc(sz) _rtw_zvmalloc((sz))
#define rtw_vmfree(pbuf, sz) _rtw_vmfree((pbuf), (sz))
void *rtw_malloc2d(int h, int w, int size);

4
drivers/staging/r8188eu/os_dep/ioctl_linux.c
View File

@ -5575,7 +5575,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
return -ENOMEM;
if (copy_from_user(ext, dwrq->pointer, len)) {
rtw_vmfree(ext, len);
vfree(ext);
return -EFAULT;
}
@ -5614,7 +5614,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
FREE_EXT:
rtw_vmfree(ext, len);
vfree(ext);
return ret;
}

7
drivers/staging/r8188eu/os_dep/osdep_service.c
View File

@ -53,11 +53,6 @@ inline u8 *_rtw_zvmalloc(u32 sz)
return pbuf;
}
inline void _rtw_vmfree(u8 *pbuf, u32 sz)
{
vfree(pbuf);
}
void *rtw_malloc2d(int h, int w, int size)
{
int j;
@ -230,7 +225,7 @@ void rtw_free_netdev(struct net_device *netdev)
if (!pnpi->priv)
goto RETURN;
rtw_vmfree(pnpi->priv, pnpi->sizeof_priv);
vfree(pnpi->priv);
free_netdev(netdev);
RETURN:

2
drivers/staging/r8188eu/os_dep/usb_intf.c
View File

@ -702,7 +702,7 @@ free_adapter:
if (pnetdev)
rtw_free_netdev(pnetdev);
else if (padapter)
rtw_vmfree((u8 *)padapter, sizeof(*padapter));
vfree(padapter);
padapter = NULL;
}
exit: