[PATCH v2 3/3] staging: r8188eu: remove rtw_hal_c2h_handler function
From: Phillip Potter <phil@philpotter.co.uk>
Date: 2021-08-29 23:45:53
Also in:
lkml
Subsystem:
staging subsystem, the rest · Maintainers:
Greg Kroah-Hartman, Linus Torvalds
Remove rtw_hal_c2h_handler function from hal/hal_intf.c, as well as its declaration in include/hal_intf.h, and remove its one remaining caller within core/rtw_cmd.c. This function was a wrapper function, then simplified to always return _FAIL. Since it has no further use, remove it, as part of ongoing efforts to simplify and remove the HAL layer of the driver. Acked-by: Fabio M. De Francesco <redacted> Acked-by: Michael Straube <redacted> Signed-off-by: Phillip Potter <phil@philpotter.co.uk> --- V2: Same as V1, reissued as part of series for clarity. --- drivers/staging/r8188eu/core/rtw_cmd.c | 2 -- drivers/staging/r8188eu/hal/hal_intf.c | 5 ----- drivers/staging/r8188eu/include/hal_intf.h | 2 -- 3 files changed, 9 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index 14b74f92cd0f..fee4208dacba 100644
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c@@ -1896,8 +1896,6 @@ static void c2h_wk_callback(struct work_struct *work) } if (ccx_id_filter(c2h_evt->id)) { - /* Handle CCX report here */ - rtw_hal_c2h_handler(adapter, c2h_evt); kfree(c2h_evt); } else { #ifdef CONFIG_88EU_P2P
diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 0c835f9cd181..bcc77da06c08 100644
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c@@ -426,11 +426,6 @@ void rtw_hal_reset_security_engine(struct adapter *adapter) adapter->HalFunc.hal_reset_security_engine(adapter); } -s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt) -{ - return _FAIL; -} - c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter) { return adapter->HalFunc.c2h_id_filter_ccx;
diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 4603f9212030..954de3ab2613 100644
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h@@ -400,8 +400,6 @@ int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, void rtw_hal_notch_filter(struct adapter *adapter, bool enable); void rtw_hal_reset_security_engine(struct adapter *adapter); -s32 rtw_hal_c2h_handler(struct adapter *adapter, - struct c2h_evt_hdr *c2h_evt); c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter); void indicate_wx_scan_complete_event(struct adapter *padapter); u8 rtw_do_join(struct adapter *padapter);
--
2.31.1