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: Phillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210818234853.208448-5-phil@philpotter.co.uk
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 858a582e674f518312649e1da5158c156c06e50c..c41312660054e6741a1f21030c9c769bcc277d97 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -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;

diff --git a/drivers/staging/r8188eu/core/rtw_mp.c b/drivers/staging/r8188eu/core/rtw_mp.c
index 07d9245fa05f753ea67f79ac4134033cca7c1252..93bb683b628f33dc7b2875e7409eafd5ac5c9504 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mp.c
+++ b/drivers/staging/r8188eu/core/rtw_mp.c
@@ -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;

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 0e137aee0aa432a8efc63fbb39cb09425254986d..52236bae8693635c975d761660176cedb3444912 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -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;

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

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

diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index 239a9703bb3442f1299cd474607678bac2013515..5a01495d74bcb5294baeea04e46635deab6eddae 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -79,7 +79,7 @@ u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path    eRFPath, u32
 /*  ODM Memory relative API. */
 void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 length)
 {
-       *pPtr = rtw_zvmalloc(length);
+       *pPtr = vzalloc(length);
 }
 
 /*  length could be ignored, used to detect memory leakage. */

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 78e58f9150f328ef30b5eccb9a210fdc2a17639f..393969f512066405d81592294b9f72032e1c693b 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -341,7 +341,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len)
        u32 fifo_data, reg_140;
        u32 addr, rstatus, loop = 0;
        u16 data_cnts = (data_len / 8) + 1;
-       u8 *pbuf = rtw_zvmalloc(data_len + 10);
+       u8 *pbuf = vzalloc(data_len + 10);
        DBG_88E("###### %s ######\n", __func__);
 
        rtw_write8(Adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);

diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/staging/r8188eu/os_dep/osdep_service.c
index 800f493f100061f35357ed873696a8fd5e548f51..8a797bfcb7f50159adfe28f1bcd7e5fbfa3aa599 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/r8188eu/os_dep/osdep_service.c
@@ -152,7 +152,7 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv)
 
        pnpi = netdev_priv(pnetdev);
 
-       pnpi->priv = rtw_zvmalloc(sizeof_priv);
+       pnpi->priv = vzalloc(sizeof_priv);
        if (!pnpi->priv) {
                free_netdev(pnetdev);
                pnetdev = NULL;

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index 0f28ed77ef65a616786876f9395eed5ecc649459..e002070f7fba372b80bf9af7f24b543ad01e1c8f 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -569,7 +569,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
        struct net_device *pnetdev = NULL;
        int status = _FAIL;
 
-       padapter = (struct adapter *)rtw_zvmalloc(sizeof(*padapter));
+       padapter = vzalloc(sizeof(*padapter));
        if (!padapter)
                goto exit;
        padapter->dvobj = dvobj;