[PATCH 31/61] staging: rtl8723bs: replace rtw_sctx_done with direct status call
From: Arsenii Pashchenko
Date: Wed Jul 15 2026 - 08:55:48 EST
Remove the redundant rtw_sctx_done() wrapper function from rtw_xmit.c
and replace its call sites with direct calls to rtw_sctx_done_err().
The helper provides no extra logic, serving only to pass the fixed
RTW_SCTX_DONE_SUCCESS status code to the underlying error-handling
function. Removing it simplifies the transmit context interface and
reduces call overhead.
Clean up the function definition, remove its prototype from the header
file, and update all invocations across the driver.
Signed-off-by: Arsenii Pashchenko <ulijg308@xxxxxxxxx>
---
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +-
drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 ----
drivers/staging/rtl8723bs/include/rtw_xmit.h | 1 -
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index c8bdd0f3c..01f8b378e 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -463,7 +463,7 @@ int rtw_cmd_thread(void *context)
FUNC_ADPT_ARG(pcmd->padapter));
if (pcmd->res == H2C_SUCCESS)
- rtw_sctx_done(&pcmd->sctx);
+ rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_SUCCESS);
else
rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_CMD_ERROR);
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index fdda407c1..9a525be74 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -2565,10 +2565,6 @@ void rtw_sctx_done_err(struct submit_ctx **sctx, int status)
}
}
-void rtw_sctx_done(struct submit_ctx **sctx)
-{
- rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS);
-}
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{
diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h
index f67cb22e3..f85a03efe 100644
--- a/drivers/staging/rtl8723bs/include/rtw_xmit.h
+++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h
@@ -212,7 +212,6 @@ enum {
void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms);
int rtw_sctx_wait(struct submit_ctx *sctx);
void rtw_sctx_done_err(struct submit_ctx **sctx, int status);
-void rtw_sctx_done(struct submit_ctx **sctx);
struct xmit_buf {
struct list_head list;
--
2.55.0