staging: rtl8723bs: Remove function pointers starting with hal_init
cover staging: rtl8723bs: Remove function pointers starting with hal_init
Remove function pointers and replace them with function names to increase readability.
Tested with rtl8723bs in ODYS Trendbook Next 14
Philipp Hortmann (15):
staging: rtl8723bs: Remove function pointer hal_init
staging: rtl8723bs: Remove function pointer hal_deinit
staging: rtl8723bs: Remove function pointer free_hal_data
staging: rtl8723bs: Remove function pointer init_xmit_priv
staging: rtl8723bs: Remove function pointer free_xmit_priv
staging: rtl8723bs: Remove function pointer init_recv_priv
staging: rtl8723bs: Remove function pointer free_recv_priv
staging: rtl8723bs: Remove function pointer dm_init
staging: rtl8723bs: Remove function pointer dm_deinit
staging: rtl8723bs: Remove function pointer read_chip_version
staging: rtl8723bs: Remove function pointer init_default_value
staging: rtl8723bs: Remove function pointer intf_chip_configure
staging: rtl8723bs: Remove function pointer read_adapter_info
staging: rtl8723bs: Remove function pointer enable_interrupt
staging: rtl8723bs: Remove function pointer disable_interrupt
drivers/staging/rtl8723bs/hal/hal_intf.c | 46 ++++++------------- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 12 +---- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 25 ++-------- drivers/staging/rtl8723bs/include/hal_intf.h | 23 ---------- .../staging/rtl8723bs/include/rtl8723b_recv.h | 5 ++ .../staging/rtl8723bs/include/rtl8723b_xmit.h | 2 + 6 files changed, 26 insertions(+), 87 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/15 staging: rtl8723bs: Remove function pointer hal_init
Remove function pointer hal_init and use rtl8723bs_hal_init directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 1 + 4 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -1
@@ -78,7 +78,7 @@ uint rtw_hal_init(struct adapter *padapter)uint status;struct dvobj_priv *dvobj =adapter_to_dvobj (padapter); - status = padapter->HalFunc.hal_init (padapter); + status =rtl8723bs_hal_init (padapter);if (status == _SUCCESS) {rtw_hal_init_opmode (padapter);
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -2
@@ -583,7 +583,7 @@ static bool HalDetectPwrDownMode(struct adapter *Adapter)return pHalData->pwrdown; }/* HalDetectPwrDownMode */ -static u32 rtl8723bs_hal_init (struct adapter *padapter) +u32 rtl8723bs_hal_init (struct adapter *padapter) {s32 ret;struct hal_com_data *pHalData;
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->hal_init = &rtl8723bs_hal_init; pHalFunc->hal_deinit = &rtl8723bs_hal_deinit; pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -u32 (*hal_init)(struct adapter *padapter);u32 (*hal_deinit)(struct adapter *padapter);void (*free_hal_data)(struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +1 -0
@@ -405,6 +405,7 @@ struct txdesc_8723b {void rtl8723b_update_txdesc (struct xmit_frame *pxmitframe,u8 *pmem);void rtl8723b_fill_fake_txdesc (struct adapter *padapter,u8 *pDesc,u32 BufferLen,u8 IsPsPoll,u8 IsBTQosNull,u8 bDataFrame); +u32 rtl8723bs_hal_init (struct adapter *padapter);s32 rtl8723bs_init_xmit_priv (struct adapter *padapter);void rtl8723bs_free_xmit_priv (struct adapter *padapter);s32 rtl8723bs_hal_xmit (struct adapter *padapter,struct xmit_frame *pxmitframe);
Signature · 1 line
2.43.0
PATCH 2/15 staging: rtl8723bs: Remove function pointer hal_deinit
In reply to Philipp HortmannRemove function pointer hal_deinit and use rtl8723bs_hal_deinit directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 1 + 4 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -1
@@ -107,7 +107,7 @@ uint rtw_hal_deinit(struct adapter *padapter)uint status = _SUCCESS;struct dvobj_priv *dvobj =adapter_to_dvobj (padapter); - status = padapter->HalFunc.hal_deinit (padapter); + status =rtl8723bs_hal_deinit (padapter);if (status == _SUCCESS) { padapter = dvobj->padapters;
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -3
@@ -884,7 +884,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)HalPwrSeqCmdParsing (padapter,PWR_CUT_ALL_MSK ,PWR_FAB_ALL_MSK ,PWR_INTF_SDIO_MSK , rtl8723B_card_disable_flow); } -static u32 rtl8723bs_hal_deinit (struct adapter *padapter) +u32 rtl8723bs_hal_deinit (struct adapter *padapter) {struct dvobj_priv *psdpriv = padapter->dvobj;struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
@@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->hal_deinit = &rtl8723bs_hal_deinit; - pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv; pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -u32 (*hal_deinit)(struct adapter *padapter); -void (*free_hal_data)(struct adapter *padapter);s32 (*init_xmit_priv)(struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtl8723b_xmit.h +1 -0
@@ -406,6 +406,7 @@ void rtl8723b_update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem);void rtl8723b_fill_fake_txdesc (struct adapter *padapter,u8 *pDesc,u32 BufferLen,u8 IsPsPoll,u8 IsBTQosNull,u8 bDataFrame);u32 rtl8723bs_hal_init (struct adapter *padapter); +u32 rtl8723bs_hal_deinit (struct adapter *padapter);s32 rtl8723bs_init_xmit_priv (struct adapter *padapter);void rtl8723bs_free_xmit_priv (struct adapter *padapter);s32 rtl8723bs_hal_xmit (struct adapter *padapter,struct xmit_frame *pxmitframe);
Signature · 1 line
2.43.0
PATCH 3/15 staging: rtl8723bs: Remove function pointer free_hal_data
In reply to Philipp HortmannRemove function pointer free_hal_data and function rtl8723b_free_hal_data as it is dead code.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 --- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 6 ------ drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 11 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +0 -3
@@ -35,9 +35,6 @@ void rtw_hal_free_data(struct adapter *padapter) {/* free HAL Data */ rtw_hal_data_deinit (padapter); - -if (padapter->HalFunc.free_hal_data) - padapter->HalFunc.free_hal_data (padapter); }void rtw_hal_dm_init (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -6
@@ -439,10 +439,6 @@ void rtl8723b_InitializeFirmwareVars(struct adapter *padapter)/* pHalData->H2CStopInsertQueue = false; */ } -static void rtl8723b_free_hal_data (struct adapter *padapter) -{ -} -/* */ /* Efuse related code */ /* */
@@ -1827,8 +1823,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_lvoid rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->free_hal_data = &rtl8723b_free_hal_data; - pHalFunc->dm_init = &rtl8723b_init_dm_priv; pHalFunc->read_chip_version = &rtl8723b_read_chip_version;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*free_hal_data)(struct adapter *padapter); -s32 (*init_xmit_priv)(struct adapter *padapter);void (*free_xmit_priv)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 4/15 staging: rtl8723bs: Remove function pointer init_xmit_priv
In reply to Philipp HortmannRemove function pointer init_xmit_priv and use rtl8723bs_init_xmit_priv directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -3
@@ -220,9 +220,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)s32 rtw_hal_init_xmit_priv (struct adapter *padapter) { -if (padapter->HalFunc.init_xmit_priv) -return padapter->HalFunc.init_xmit_priv (padapter); -return _FAIL; +return rtl8723bs_init_xmit_priv (padapter); }void rtw_hal_free_xmit_priv (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv; pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv; pHalFunc->init_recv_priv = &rtl8723bs_init_recv_priv;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -s32 (*init_xmit_priv)(struct adapter *padapter);void (*free_xmit_priv)(struct adapter *padapter);s32 (*init_recv_priv)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 5/15 staging: rtl8723bs: Remove function pointer free_xmit_priv
In reply to Philipp HortmannRemove function pointer free_xmit_priv and use rtl8723bs_free_xmit_priv directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -225,8 +225,7 @@ s32 rtw_hal_init_xmit_priv(struct adapter *padapter)void rtw_hal_free_xmit_priv (struct adapter *padapter) { -if (padapter->HalFunc.free_xmit_priv) - padapter->HalFunc.free_xmit_priv (padapter); +rtl8723bs_free_xmit_priv (padapter); }s32 rtw_hal_init_recv_priv (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -2
@@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv; - pHalFunc->init_recv_priv = &rtl8723bs_init_recv_priv; pHalFunc->free_recv_priv = &rtl8723bs_free_recv_priv;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*free_xmit_priv)(struct adapter *padapter); -s32 (*init_recv_priv)(struct adapter *padapter);void (*free_recv_priv)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 6/15 staging: rtl8723bs: Remove function pointer init_recv_priv
In reply to Philipp HortmannRemove function pointer init_recv_priv and use rtl8723bs_init_recv_priv directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +---- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -4
@@ -230,10 +230,7 @@ void rtw_hal_free_xmit_priv(struct adapter *padapter)s32 rtw_hal_init_recv_priv (struct adapter *padapter) { -if (padapter->HalFunc.init_recv_priv) -return padapter->HalFunc.init_recv_priv (padapter); - -return _FAIL; +return rtl8723bs_init_recv_priv (padapter); }void rtw_hal_free_recv_priv (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->init_recv_priv = &rtl8723bs_init_recv_priv; pHalFunc->free_recv_priv = &rtl8723bs_free_recv_priv; pHalFunc->init_default_value = &rtl8723bs_init_default_value;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -s32 (*init_recv_priv)(struct adapter *padapter);void (*free_recv_priv)(struct adapter *padapter);void (*dm_init)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 7/15 staging: rtl8723bs: Remove function pointer free_recv_priv
In reply to Philipp HortmannRemove function pointer free_recv_priv and use rtl8723bs_free_recv_priv directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -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)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -2
@@ -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;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -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);
Signature · 1 line
2.43.0
PATCH 8/15 staging: rtl8723bs: Remove function pointer dm_init
In reply to Philipp HortmannRemove function pointer dm_init and use rtl8723b_init_dm_priv directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -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)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1823,8 +1823,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_lvoid 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;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -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);
Signature · 1 line
2.43.0
PATCH 9/15 staging: rtl8723bs: Remove function pointer dm_deinit
In reply to Philipp HortmannRemove function pointer dm_deinit as it is not linked to any function.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 --- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +0 -3
@@ -44,9 +44,6 @@ void rtw_hal_dm_init(struct adapter *padapter)void rtw_hal_dm_deinit (struct adapter *padapter) { -/* cancel dm timer */ -if (padapter->HalFunc.dm_deinit) - padapter->HalFunc.dm_deinit (padapter); }static void rtw_hal_init_opmode (struct adapter *padapter)
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*dm_deinit)(struct adapter *padapter);void (*read_chip_version)(struct adapter *padapter);void (*init_default_value)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 10/15 staging: rtl8723bs: Remove function pointer read_chip_version
In reply to Philipp HortmannRemove function pointer read_chip_version and use rtl8723b_read_chip_version directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 2 ++ 4 files changed, 4 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -21,8 +21,7 @@ void rtw_hal_read_chip_info(struct adapter *padapter)void rtw_hal_read_chip_version (struct adapter *padapter) { -if (padapter->HalFunc.read_chip_version) - padapter->HalFunc.read_chip_version (padapter); +rtl8723b_read_chip_version (padapter); }void rtw_hal_def_value_init (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
@@ -1610,7 +1610,7 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter)return ChipVersion; } -static void rtl8723b_read_chip_version (struct adapter *padapter) +void rtl8723b_read_chip_version (struct adapter *padapter) {ReadChipVersion8723B (padapter); }
@@ -1823,8 +1823,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_lvoid rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->read_chip_version = &rtl8723b_read_chip_version; - pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8723B; pHalFunc->set_channel_handler = &PHY_SwChnl8723B;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*read_chip_version)(struct adapter *padapter); -void (*init_default_value)(struct adapter *padapter);void (*intf_chip_configure)(struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtl8723b_recv.h +2 -0
@@ -87,4 +87,6 @@ void rtl8723bs_free_recv_priv(struct adapter *padapter);void rtl8723b_query_rx_phy_status (union recv_frame *prframe,struct phy_stat *pphy_stat);void rtl8723b_process_phy_info (struct adapter *padapter,void *prframe); +void rtl8723b_read_chip_version (struct adapter *padapter); +#endif
Signature · 1 line
2.43.0
PATCH 11/15 staging: rtl8723bs: Remove function pointer init_default_value
In reply to Philipp HortmannRemove function pointer init_default_value and use rtl8723bs_init_default_value directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 1 + 4 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -26,8 +26,7 @@ void rtw_hal_read_chip_version(struct adapter *padapter)void rtw_hal_def_value_init (struct adapter *padapter) { -if (padapter->HalFunc.init_default_value) - padapter->HalFunc.init_default_value (padapter); +rtl8723bs_init_default_value (padapter); }void rtw_hal_free_data (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -2
@@ -937,7 +937,7 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter)return _SUCCESS; } -static void rtl8723bs_init_default_value (struct adapter *padapter) +void rtl8723bs_init_default_value (struct adapter *padapter) {struct hal_com_data *pHalData;
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->init_default_value = &rtl8723bs_init_default_value; pHalFunc->intf_chip_configure = &rtl8723bs_interface_configure; pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*init_default_value)(struct adapter *padapter); -void (*intf_chip_configure)(struct adapter *padapter);void (*read_adapter_info)(struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtl8723b_recv.h +1 -0
@@ -88,5 +88,6 @@ void rtl8723b_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *ppvoid rtl8723b_process_phy_info (struct adapter *padapter,void *prframe);void rtl8723b_read_chip_version (struct adapter *padapter); +void rtl8723bs_init_default_value (struct adapter *padapter);#endif
Signature · 1 line
2.43.0
PATCH 12/15 staging: rtl8723bs: Remove function pointer intf_chip_configure
In reply to Philipp HortmannRemove function pointer intf_chip_configure and use rtl8723bs_interface_configure directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 1 + 4 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -9,8 +9,7 @@void rtw_hal_chip_configure (struct adapter *padapter) { -if (padapter->HalFunc.intf_chip_configure) - padapter->HalFunc.intf_chip_configure (padapter); +rtl8723bs_interface_configure (padapter); }void rtw_hal_read_chip_info (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -2
@@ -950,7 +950,7 @@ void rtl8723bs_init_default_value(struct adapter *padapter) pHalData->SdioRxFIFOCnt =0 ; } -static void rtl8723bs_interface_configure (struct adapter *padapter) +void rtl8723bs_interface_configure (struct adapter *padapter) {struct hal_com_data *pHalData =GET_HAL_DATA (padapter);struct dvobj_priv *pdvobjpriv =adapter_to_dvobj (padapter);
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->intf_chip_configure = &rtl8723bs_interface_configure; pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS; pHalFunc->enable_interrupt = &EnableInterrupt8723BSdio;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*intf_chip_configure)(struct adapter *padapter); -void (*read_adapter_info)(struct adapter *padapter);void (*enable_interrupt)(struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtl8723b_recv.h +1 -0
@@ -89,5 +89,6 @@ void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe);void rtl8723b_read_chip_version (struct adapter *padapter);void rtl8723bs_init_default_value (struct adapter *padapter); +void rtl8723bs_interface_configure (struct adapter *padapter);#endif
Signature · 1 line
2.43.0
PATCH 13/15 staging: rtl8723bs: Remove function pointer read_adapter_info
In reply to Philipp HortmannRemove function pointer read_adapter_info and use ReadAdapterInfo8723BS directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 1 + 4 files changed, 3 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -14,8 +14,7 @@ void rtw_hal_chip_configure(struct adapter *padapter)void rtw_hal_read_chip_info (struct adapter *padapter) { -if (padapter->HalFunc.read_adapter_info) - padapter->HalFunc.read_adapter_info (padapter); +ReadAdapterInfo8723BS (padapter); }void rtw_hal_read_chip_version (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -3
@@ -1132,7 +1132,7 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)return _SUCCESS; } -static void ReadAdapterInfo8723BS (struct adapter *padapter) +void ReadAdapterInfo8723BS (struct adapter *padapter) {/* Read EEPROM size before call any EEPROM function */ padapter->EepromAddressSize =GetEEPROMSize8723B (padapter);
@@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS; - pHalFunc->enable_interrupt = &EnableInterrupt8723BSdio; pHalFunc->disable_interrupt = &DisableInterrupt8723BSdio; pHalFunc->check_ips_status = &CheckIPSStatus;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*read_adapter_info)(struct adapter *padapter); -void (*enable_interrupt)(struct adapter *padapter);void (*disable_interrupt)(struct adapter *padapter);u8 (*check_ips_status)(struct adapter *padapter);
drivers/staging/rtl8723bs/include/rtl8723b_recv.h +1 -0
@@ -90,5 +90,6 @@ void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe);void rtl8723b_read_chip_version (struct adapter *padapter);void rtl8723bs_init_default_value (struct adapter *padapter);void rtl8723bs_interface_configure (struct adapter *padapter); +void ReadAdapterInfo8723BS (struct adapter *padapter);#endif
Signature · 1 line
2.43.0
PATCH 14/15 staging: rtl8723bs: Remove function pointer enable_interrupt
In reply to Philipp HortmannRemove function pointer enable_interrupt and use EnableInterrupt8723BSdio directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -146,8 +146,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariabvoid rtw_hal_enable_interrupt (struct adapter *padapter) { -if (padapter->HalFunc.enable_interrupt) - padapter->HalFunc.enable_interrupt (padapter); +EnableInterrupt8723BSdio (padapter); }void rtw_hal_disable_interrupt (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->enable_interrupt = &EnableInterrupt8723BSdio; pHalFunc->disable_interrupt = &DisableInterrupt8723BSdio; pHalFunc->check_ips_status = &CheckIPSStatus; pHalFunc->SetHwRegHandler = &SetHwReg8723BS;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*enable_interrupt)(struct adapter *padapter);void (*disable_interrupt)(struct adapter *padapter);u8 (*check_ips_status)(struct adapter *padapter);void (*set_channel_handler)(struct adapter *padapter,u8 channel);
Signature · 1 line
2.43.0
PATCH 15/15 staging: rtl8723bs: Remove function pointer disable_interrupt
In reply to Philipp HortmannRemove function pointer disable_interrupt and use DisableInterrupt8723BSdio directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -151,8 +151,7 @@ void rtw_hal_enable_interrupt(struct adapter *padapter)void rtw_hal_disable_interrupt (struct adapter *padapter) { -if (padapter->HalFunc.disable_interrupt) - padapter->HalFunc.disable_interrupt (padapter); +DisableInterrupt8723BSdio (padapter); }u8 rtw_hal_check_ips_status (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->disable_interrupt = &DisableInterrupt8723BSdio; pHalFunc->check_ips_status = &CheckIPSStatus; pHalFunc->SetHwRegHandler = &SetHwReg8723BS; pHalFunc->GetHwRegHandler = &GetHwReg8723BS;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*disable_interrupt)(struct adapter *padapter);u8 (*check_ips_status)(struct adapter *padapter);void (*set_channel_handler)(struct adapter *padapter,u8 channel);void (*set_chnl_bw_handler)(struct adapter *padapter,u8 channel,enum channel_width Bandwidth,u8 Offset40,u8 Offset80);
Signature · 1 line
2.43.0