staging: r8188eu: remove rtw_buf_free() function

It is just a wrapper around kfree(), so just replace all calls with
kfree() instead.  The pointer is also set to NULL and the length set to
0 to emulate the original logic, just to be "safe" as I do not have a
device to test with, but odds are that can be removed later on.

Link: https://lore.kernel.org/r/20210730092417.1014392-8-gregkh@linuxfoundation.org
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 887e3a89bd27e038820a5a004fc97ba4dd4844c8..8266e9a88e01aa324ec0d341903af73ddb68ee74 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -102,8 +102,12 @@ static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen)
 
 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
 {
-       rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len);
-       rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len);
+       kfree(&pmlmepriv->assoc_req);
+       pmlmepriv->assoc_req = NULL;
+       pmlmepriv->assoc_req_len = 0;
+       kfree(&pmlmepriv->assoc_rsp);
+       pmlmepriv->assoc_rsp = NULL;
+       pmlmepriv->assoc_rsp_len = 0;
        rtw_free_mlme_ie_data(&pmlmepriv->wps_beacon_ie, &pmlmepriv->wps_beacon_ie_len);
        rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_req_ie, &pmlmepriv->wps_probe_req_ie_len);
        rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_resp_ie, &pmlmepriv->wps_probe_resp_ie_len);

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 488a18133e59222a82d64a3cb3a704d64bff6f71..36b4e073d24c904b332b51002b97b0ffefb34e92 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -1522,7 +1522,9 @@ report_assoc_result:
        if (res > 0) {
                rtw_buf_update(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len, pframe, pkt_len);
        } else {
-               rtw_buf_free(&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len);
+               kfree(&pmlmepriv->assoc_rsp);
+               pmlmepriv->assoc_rsp = NULL;
+               pmlmepriv->assoc_rsp_len = 0;
        }
 
        report_join_res(padapter, res);
@@ -5549,8 +5551,11 @@ void issue_assocreq(struct adapter *padapter)
 exit:
        if (ret == _SUCCESS)
                rtw_buf_update(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len, (u8 *)pwlanhdr, pattrib->pktlen);
-       else
-               rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len);
+       else {
+               kfree(&pmlmepriv->assoc_req);
+               pmlmepriv->assoc_req = NULL;
+               pmlmepriv->assoc_req_len = 0;
+       }
 
        return;
 }

diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index ac45eec75153949964c3d2ed7a948959dc02976b..df59fa325e6e63e04d61951b92414888cd66fd64 100644 (file)
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -440,7 +440,6 @@ u64 rtw_division64(u64 x, u64 y);
                         (((u64) (a)[3]) << 24) | (((u64) (a)[2]) << 16) | \
                         (((u64) (a)[1]) << 8) | ((u64) (a)[0]))
 
-void rtw_buf_free(u8 **buf, u32 *buf_len);
 void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len);
 
 struct rtw_cbuf {

diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/staging/r8188eu/os_dep/osdep_service.c
index 526e8d2d49a79798a71cd877536149d037d0bc77..c7e83c87ad4aaf96f75da14d422c77be7935dfb8 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/r8188eu/os_dep/osdep_service.c
@@ -388,13 +388,6 @@ u64 rtw_division64(u64 x, u64 y)
        return x;
 }
 
-void rtw_buf_free(u8 **buf, u32 *buf_len)
-{
-       *buf_len = 0;
-       kfree(*buf);
-       *buf = NULL;
-}
-
 void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len)
 {
        u32 ori_len = 0, dup_len = 0;