staging: rtl8723bs: make xmit buffer free helpers return void
cover staging: rtl8723bs: make xmit buffer free helpers return void
Neither rtw_free_xmitbuf_ext() nor rtw_free_xmitbuf() has callers that check its return value.
Change both functions to return void and remove the redundant _SUCCESS and _FAIL return values. Also remove extern from their declarations.
The first patch updates the lower-level helper, and the second updates its caller.
Hungyu Lin (2):
staging: rtl8723bs: make rtw_free_xmitbuf_ext() return void
staging: rtl8723bs: make rtw_free_xmitbuf() return void
drivers/staging/rtl8723bs/core/rtw_xmit.c | 11 ++++------- drivers/staging/rtl8723bs/include/rtw_xmit.h | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/2 staging: rtl8723bs: make rtw_free_xmitbuf_ext() return void
The return value of rtw_free_xmitbuf_ext() is never checked. Change its return type to void and remove the redundant _SUCCESS and _FAIL return values. Also remove the unnecessary extern keyword from its declaration.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 ++---- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +2 -4
@@ -1534,13 +1534,13 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)return pxmitbuf; } -s32 rtw_free_xmitbuf_ext (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf) +void rtw_free_xmitbuf_ext (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf) {unsigned long irqL;struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;if (!pxmitbuf) -return _FAIL; +return ;spin_lock_irqsave (&pfree_queue->lock, irqL);
@@ -1550,8 +1550,6 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) pxmitpriv->free_xmit_extbuf_cnt++;spin_unlock_irqrestore (&pfree_queue->lock, irqL); - -return _SUCCESS; }struct xmit_buf *rtw_alloc_xmitbuf (struct xmit_priv *pxmitpriv)
drivers/staging/rtl8723bs/include/rtw_xmit.h +1 -1
@@ -403,7 +403,7 @@ extern struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv,#define rtw_alloc_bcnxmitframe (p) __rtw_alloc_cmdxmitframe(p, CMDBUF_BEACON)extern struct xmit_buf *rtw_alloc_xmitbuf_ext (struct xmit_priv *pxmitpriv); -extern s32 rtw_free_xmitbuf_ext (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf); +void rtw_free_xmitbuf_ext (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf);extern struct xmit_buf *rtw_alloc_xmitbuf (struct xmit_priv *pxmitpriv);extern s32 rtw_free_xmitbuf (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf);
Signature · 1 line
2.43.0
PATCH 2/2 staging: rtl8723bs: make rtw_free_xmitbuf() return void
In reply to Hungyu LinThe return value of rtw_free_xmitbuf() is never checked. Change its return type to void and remove the redundant _SUCCESS and _FAIL return values. Also remove the unnecessary extern keyword from its declaration.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 ++--- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +2 -3
@@ -1593,13 +1593,13 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)return pxmitbuf; } -s32 rtw_free_xmitbuf (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf) +void rtw_free_xmitbuf (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf) {unsigned long irqL;struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;if (!pxmitbuf) -return _FAIL; +return ;if (pxmitbuf->sctx)rtw_sctx_done_err (&pxmitbuf->sctx,RTW_SCTX_DONE_BUF_FREE );
@@ -1618,7 +1618,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) pxmitpriv->free_xmitbuf_cnt++;spin_unlock_irqrestore (&pfree_xmitbuf_queue->lock, irqL); } -return _SUCCESS; }static void rtw_init_xmitframe (struct xmit_frame *pxframe)
drivers/staging/rtl8723bs/include/rtw_xmit.h +1 -1
@@ -406,7 +406,7 @@ extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv);void rtw_free_xmitbuf_ext (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf);extern struct xmit_buf *rtw_alloc_xmitbuf (struct xmit_priv *pxmitpriv); -extern s32 rtw_free_xmitbuf (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf); +void rtw_free_xmitbuf (struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf);void rtw_count_tx_stats (struct adapter *padapter,struct xmit_frame *pxmitframe,int sz);extern void rtw_update_protection (struct adapter *padapter,u8 *ie,uint ie_len);
Signature · 1 line
2.43.0