staging: rtl8723bs: merge rtw_os_recvbuf_resource_free into rtl8723bs_recv.c

Merge rtw_os_recvbuf_resource_free into rtl8723bs_init_recv_priv and into
rtl8723bs_free_recv_priv to reduce code in the os_dep directory.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Reviewed-by: Hans de Goede <hansg@kernel.org>
Link: https://lore.kernel.org/r/20250822135418.118115-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
index 28c914ec26049290cd5fe51512f3b34a3c08cac8..399edfbf8ec6da6f0e7a02c7563c985b9cd10f0d 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
@@ -431,7 +431,8 @@ initbuferror:
                precvpriv->free_recv_buf_queue_cnt = 0;
                for (i = 0; i < n ; i++) {
                        list_del_init(&precvbuf->list);
-                       rtw_os_recvbuf_resource_free(padapter, precvbuf);
+                       if (precvbuf->pskb)
+                               dev_kfree_skb_any(precvbuf->pskb);
                        precvbuf++;
                }
                precvpriv->precv_buf = NULL;
@@ -467,7 +468,8 @@ void rtl8723bs_free_recv_priv(struct adapter *padapter)
                precvpriv->free_recv_buf_queue_cnt = 0;
                for (i = 0; i < NR_RECVBUFF; i++) {
                        list_del_init(&precvbuf->list);
-                       rtw_os_recvbuf_resource_free(padapter, precvbuf);
+                       if (precvbuf->pskb)
+                               dev_kfree_skb_any(precvbuf->pskb);
                        precvbuf++;
                }
                precvpriv->precv_buf = NULL;

diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/staging/rtl8723bs/include/recv_osdep.h
index 9b3f4e8293ee0830fafa432e4e1fa0765da26de8..227e172bf1c3a518191052f5cd1088ee09dcdfec 100644 (file)
--- a/drivers/staging/rtl8723bs/include/recv_osdep.h
+++ b/drivers/staging/rtl8723bs/include/recv_osdep.h
@@ -18,8 +18,6 @@ extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *pretu
 int    rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
 void rtw_free_recv_priv(struct recv_priv *precvpriv);
 
-void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf);
-
 struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 *pdata);
 void rtw_os_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pkt, struct rx_pkt_attrib *pattrib);
 

diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index c71e0c762f4f7d2efeffa05d74d504e66418983e..ebe169507dc88c1a4d40ef063912755d64ddb415 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -9,13 +9,6 @@
 #include <net/cfg80211.h>
 #include <linux/unaligned.h>
 
-/* free os related resource in struct recv_buf */
-void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf)
-{
-       if (precvbuf->pskb)
-               dev_kfree_skb_any(precvbuf->pskb);
-}
-
 struct sk_buff *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 *pdata)
 {
        u16 eth_type;