From: Philipp Hortmann Date: Sat, 5 Oct 2024 20:33:50 +0000 (+0200) Subject: staging: rtl8723bs: Remove function pointer free_recv_priv X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=274c26e7531a0eb66a0a4c06f3da7cd701fa5820;p=users%2Fjedix%2Flinux-maple.git staging: rtl8723bs: Remove function pointer free_recv_priv Remove function pointer free_recv_priv and use rtl8723bs_free_recv_priv directly to increase readability. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/17f06e3495abea1f6ad2a2f8d4f4ff1f23bef654.1727966761.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c index d571bf81ab2be..de7dfaa69c66a 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -235,8 +235,7 @@ s32 rtw_hal_init_recv_priv(struct adapter *padapter) void rtw_hal_free_recv_priv(struct adapter *padapter) { - if (padapter->HalFunc.free_recv_priv) - padapter->HalFunc.free_recv_priv(padapter); + rtl8723bs_free_recv_priv(padapter); } void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c index 8d2a44726fc7d..52cd980c20038 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) rtl8723b_set_hal_ops(pHalFunc); - pHalFunc->free_recv_priv = &rtl8723bs_free_recv_priv; - pHalFunc->init_default_value = &rtl8723bs_init_default_value; pHalFunc->intf_chip_configure = &rtl8723bs_interface_configure; pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index cc01b8d56498d..ced414f2368ed 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -162,8 +162,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { - void (*free_recv_priv)(struct adapter *padapter); - void (*dm_init)(struct adapter *padapter); void (*dm_deinit)(struct adapter *padapter); void (*read_chip_version)(struct adapter *padapter);