From dfdf0d14ae1b2cffe6b16d11a81c52fc7533834a Mon Sep 17 00:00:00 2001 From: Hungyu Lin Date: Mon, 13 Jul 2026 07:05:36 +0000 Subject: [PATCH] staging: rtl8723bs: simplify rtw_xmitframe_coalesce() control flow Replace goto-based error handling with direct returns and remove the temporary res variable. No functional change intended. Signed-off-by: Hungyu Lin Reviewed-by: Dan Carpenter Link: https://patch.msgid.link/20260713070537.15903-5-dennylin0707@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index cfeaf5575c61..3baa9704dec7 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1082,7 +1082,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct u8 *pbuf_start; s32 bmcst = is_multicast_ether_addr(pattrib->ra); - s32 res = _SUCCESS; int ret; if (!pxmitframe->buf_addr) @@ -1094,10 +1093,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct mem_start = pbuf_start + hw_hdr_offset; ret = rtw_make_wlanhdr(padapter, mem_start, pattrib); - if (ret) { - res = _FAIL; - goto exit; - } + if (ret) + return _FAIL; _rtw_open_pktfile(pkt, &pktfile); ret = _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); @@ -1176,10 +1173,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct } ret = xmitframe_addmic(padapter, pxmitframe); - if (ret) { - res = _FAIL; - goto exit; - } + if (ret) + return _FAIL; xmitframe_swencrypt(padapter, pxmitframe); @@ -1188,8 +1183,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct else pattrib->vcs_mode = NONE_VCS; -exit: - return res; + return _SUCCESS; } /* broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption */