From 5d44452604467bdb1ac46e589b42b42037b75598 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 29 Sep 2021 21:26:55 +0200 Subject: [PATCH] staging: r8188eu: remove free_recv_priv from struct hal_ops Remove free_recv_priv from struct hal_ops and remove its wrapper rtw_hal_free_recv_priv(). Call rtl8188eu_free_recv_priv() directly instead. Signed-off-by: Michael Straube Link: https://lore.kernel.org/r/20210929192657.9569-6-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/core/rtw_recv.c | 2 +- drivers/staging/r8188eu/hal/hal_intf.c | 6 ------ drivers/staging/r8188eu/hal/usb_halinit.c | 2 -- drivers/staging/r8188eu/include/hal_intf.h | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c index 3054cc6459c54..51a13262a226f 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -104,7 +104,7 @@ void _rtw_free_recv_priv(struct recv_priv *precvpriv) vfree(precvpriv->pallocated_frame_buf); - rtw_hal_free_recv_priv(padapter); + rtl8188eu_free_recv_priv(padapter); } struct recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue) diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index ad327c495b5dc..039723d62ae18 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -72,12 +72,6 @@ u32 rtw_hal_inirp_deinit(struct adapter *adapt) return _FAIL; } -void rtw_hal_free_recv_priv(struct adapter *adapt) -{ - if (adapt->HalFunc.free_recv_priv) - adapt->HalFunc.free_recv_priv(adapt); -} - void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level) { struct mlme_priv *pmlmepriv = &adapt->mlmepriv; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 6465be8955742..bdadd801693f0 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -2153,8 +2153,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) halfunc->inirp_init = &rtl8188eu_inirp_init; halfunc->inirp_deinit = &rtl8188eu_inirp_deinit; - halfunc->free_recv_priv = &rtl8188eu_free_recv_priv; - halfunc->SetHwRegHandler = &SetHwReg8188EU; halfunc->GetHwRegHandler = &GetHwReg8188EU; } diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index a74250f6d9dda..2f8c62ebf6b73 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -128,8 +128,6 @@ struct hal_ops { u32 (*inirp_init)(struct adapter *padapter); u32 (*inirp_deinit)(struct adapter *padapter); - void (*free_recv_priv)(struct adapter *padapter); - void (*SetHwRegHandler)(struct adapter *padapter, u8 variable, u8 *val); void (*GetHwRegHandler)(struct adapter *padapter, u8 variable, @@ -185,8 +183,6 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val); u32 rtw_hal_inirp_init(struct adapter *padapter); u32 rtw_hal_inirp_deinit(struct adapter *padapter); -void rtw_hal_free_recv_priv(struct adapter *padapter); - void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level); void rtw_hal_clone_data(struct adapter *dst_adapt, struct adapter *src_adapt); -- 2.30.2