From: Philipp Hortmann Date: Sat, 5 Oct 2024 20:33:51 +0000 (+0200) Subject: staging: rtl8723bs: Remove function pointer dm_init X-Git-Tag: v6.13-rc1~30^2~189 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41dc2191962ad68de2355a91ad3f2d4d719c7b35;p=thirdparty%2Fkernel%2Flinux.git staging: rtl8723bs: Remove function pointer dm_init Remove function pointer dm_init and use rtl8723b_init_dm_priv directly to increase readability. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/e25134aacd3f784300f527d7e367b9f0f066254a.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 de7dfaa69c66a..760ba45de8f76 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -39,8 +39,7 @@ void rtw_hal_free_data(struct adapter *padapter) void rtw_hal_dm_init(struct adapter *padapter) { - if (padapter->HalFunc.dm_init) - padapter->HalFunc.dm_init(padapter); + rtl8723b_init_dm_priv(padapter); } void rtw_hal_dm_deinit(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 867021ed31bf7..106f1124964a9 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1823,8 +1823,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_l void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->dm_init = &rtl8723b_init_dm_priv; - pHalFunc->read_chip_version = &rtl8723b_read_chip_version; pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index ced414f2368ed..8b85baf5be92e 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -162,7 +162,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { - void (*dm_init)(struct adapter *padapter); void (*dm_deinit)(struct adapter *padapter); void (*read_chip_version)(struct adapter *padapter);