staging: r8188eu: Remove wrapper around vfree

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>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 549ebcccca57f33340e0f599430ae786f8c057d9..72570aede77688738b513e743a3ec7811df731a1 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -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);
        }
 
 }

diff --git a/drivers/staging/r8188eu/core/rtw_mp.c b/drivers/staging/r8188eu/core/rtw_mp.c
index 36119602541acfbb37f95051492d0ec3656a8a61..9ff0a19cc680c9a54ff22a617cd45bf006406b80 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mp.c
+++ b/drivers/staging/r8188eu/core/rtw_mp.c
@@ -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;

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 37cf22569c59c6062fe337950075d7eaad504b8b..6f6caf727f3b44f0df34dd30396a9aea7b19f937 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -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)

diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
index 4f62ef3dd2461d52cbc98d93a36813e1f70d0046..2f1d1bfb6f733748828e9683e66172b84413dd70 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
@@ -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;

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 3aab02a90697c369bb43df39f22b8186e7d4b8e6..05396cc2e82ae06a4803031c0ad238af513755af 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -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);
 

diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index 507baf9fd9139f4fc4ee52879cf6a9b5177121e2..38f6ae410e538b7fdef7ac5533f6a757a4823669 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -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)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index abbc8d22883b3289ac4ca991682da34ac150c64d..9b0d02a759a4bb2338c757e14de98e18d107a8c6 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -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__);
 }

diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index b64f8851796b0f82834e2b1028d1c85eed3c3175..1ff0980e6bfbe99a43e4315181ab1eb349343885 100644 (file)
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -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);
 

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index 5f4355cb03e7fecd62af48d3994400c3ef857ef6..11301e0f287af506385bb37624d5e31cfd051691 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -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;
 }

diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/staging/r8188eu/os_dep/osdep_service.c
index 9cf9f272cccbe29ca87aade1154bc902e2ec3256..d3603e34eeb434f25b1982921c72401a702bfb5a 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/r8188eu/os_dep/osdep_service.c
@@ -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:

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index f3321a6653fcfdccfc4ec0a00f32af3dd3ba394f..b1184c36ddfc5dfd8e0630e7ccaeede9ae321534 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -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: