[PATCH 6/6] staging: r8188eu: drop unnecessary wrapper rtw_free_mlme_priv
From: Vihas Makwana
Date: Sun Apr 10 2022 - 12:32:29 EST
Remove the unnecessary wrapper. Drop rtw_free_mlme_priv and use
_rtw_free_mlme_priv instead.
Signed-off-by: Vihas Makwana <makvihas@xxxxxxxxx>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 5 -----
drivers/staging/r8188eu/include/rtw_mlme.h | 1 -
drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++--
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index f2a61c162..c09a565b4 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -288,11 +288,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
return ie + 8;
}
-void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
-{
- _rtw_free_mlme_priv(pmlmepriv);
-}
-
static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)
{
struct wlan_network *pnetwork;
diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index b5b1a0e10..4055a15e2 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -439,7 +439,6 @@ void rtw_join_timeout_handler (struct timer_list *t);
void _rtw_scan_timeout_handler (struct timer_list *t);
void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall);
int _rtw_init_mlme_priv(struct adapter *adapter);
-void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv);
int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv);
int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv,
int keyid, u8 set_tx);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 448ea9533..adfc1e763 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -528,7 +528,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
free_mlme_ext:
free_mlme_ext_priv(&padapter->mlmeextpriv);
- rtw_free_mlme_priv(&padapter->mlmepriv);
+ _rtw_free_mlme_priv(&padapter->mlmepriv);
free_evt_priv:
rtw_free_evt_priv(&padapter->evtpriv);
@@ -576,7 +576,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
rtw_free_evt_priv(&padapter->evtpriv);
- rtw_free_mlme_priv(&padapter->mlmepriv);
+ _rtw_free_mlme_priv(&padapter->mlmepriv);
_rtw_free_xmit_priv(&padapter->xmitpriv);
_rtw_free_sta_priv(&padapter->stapriv); /* will free bcmc_stainfo here */
--
2.30.2