[PATCH 45/61] staging: rtl8723bs: remove c2h_evt_clear wrapper

[Arsenii Pashchenko]

Remove the single-line helper function c2h_evt_clear. Call rtw_write8
directly with REG_C2HEVT_CLEAR and C2H_EVT_HOST_CLOSE arguments
instead to eliminate an unnecessary function call layer.

Signed-off-by: Arsenii Pashchenko <ulijg308@xxxxxxxxx>
---
 drivers/staging/rtl8723bs/core/rtw_cmd.c    |  2 +-
 drivers/staging/rtl8723bs/hal/hal_com.c     | 12 +-----------
 drivers/staging/rtl8723bs/include/hal_com.h |  1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 01f8b378e..c2944a1c7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1694,7 +1694,7 @@ static void c2h_wk_callback(struct work_struct *work)
 		c2h_evt = (u8 *)rtw_cbuf_pop(evtpriv->c2h_queue);
 		if (c2h_evt) {
 			/* This C2H event is read, clear it */
-			c2h_evt_clear(adapter);
+			rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE);
 		} else {
 			c2h_evt = kmalloc(16, GFP_ATOMIC);
 			if (c2h_evt) {
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 638d598e4..b357c5145 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -420,16 +420,6 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 NumOutPipe)
 
 }
 
-/*
- * C2H event format:
- * Field	 TRIGGER		CONTENT	   CMD_SEQ	CMD_LEN		 CMD_ID
- * BITS	 [127:120]	[119:16]      [15:8]		  [7:4]		   [3:0]
- */
-
-void c2h_evt_clear(struct adapter *adapter)
-{
-	rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE);
-}
 
 /*
  * C2H event format:
@@ -472,7 +462,7 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)
 	 * Clear event to notify FW we have read the command.
 	 * If this field isn't clear, the FW won't update the next command message.
 	 */
-	c2h_evt_clear(adapter);
+	rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE);
 exit:
 	return ret;
 }
diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
index e6d32cf53..0a43655f7 100644
--- a/drivers/staging/rtl8723bs/include/hal_com.h
+++ b/drivers/staging/rtl8723bs/include/hal_com.h
@@ -124,7 +124,6 @@ u8 NumOutPipe
 
 
 
-void c2h_evt_clear(struct adapter *adapter);
 s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf);
 
 u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_type);
-- 
2.55.0