staging: r8188eu: make rtl8188eu_{init,free}_recv_priv() static

The functions rtl8188eu_init_recv_priv() and rtl8188eu_free_recv_priv()
are only used in rtw_recv.c. Make them static and remove the now empty
file rtl8188eu_recv.c.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220804105532.7532-3-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/Makefile b/drivers/staging/r8188eu/Makefile
index cddfee3efd369dacc046e34d83463bd6ebabdf51..b118fd9b695c60ba5dcacb61bff68b154caaffdc 100644 (file)
--- a/drivers/staging/r8188eu/Makefile
+++ b/drivers/staging/r8188eu/Makefile
@@ -18,7 +18,6 @@ r8188eu-y = \
                hal/rtl8188e_phycfg.o \
                hal/rtl8188e_rf6052.o \
                hal/rtl8188e_rxdesc.o \
-               hal/rtl8188eu_recv.o \
                hal/rtl8188eu_xmit.o \
                hal/usb_halinit.o \
                hal/usb_ops_linux.o \

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index e5a7b7dfc3879a9e1eca6a368bb8d8608458c9e8..2d4baca804e949eb70f7383edc88fce9cd747e7d 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -37,6 +37,65 @@ void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
 
 }
 
+static int rtl8188eu_init_recv_priv(struct adapter *padapter)
+{
+       struct recv_priv *precvpriv = &padapter->recvpriv;
+       int i, res = _SUCCESS;
+       struct recv_buf *precvbuf;
+
+       tasklet_init(&precvpriv->recv_tasklet,
+                    rtl8188eu_recv_tasklet,
+                    (unsigned long)padapter);
+
+       /* init recv_buf */
+       rtw_init_queue(&precvpriv->free_recv_buf_queue);
+
+       precvpriv->pallocated_recv_buf = kzalloc(NR_RECVBUFF * sizeof(struct recv_buf) + 4,
+                                                GFP_KERNEL);
+       if (!precvpriv->pallocated_recv_buf) {
+               res = _FAIL;
+               goto exit;
+       }
+
+       precvpriv->precv_buf = (u8 *)ALIGN((size_t)(precvpriv->pallocated_recv_buf), 4);
+
+       precvbuf = (struct recv_buf *)precvpriv->precv_buf;
+
+       for (i = 0; i < NR_RECVBUFF; i++) {
+               res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf);
+               if (res == _FAIL)
+                       break;
+               precvbuf->adapter = padapter;
+               precvbuf++;
+       }
+       precvpriv->free_recv_buf_queue_cnt = NR_RECVBUFF;
+       skb_queue_head_init(&precvpriv->rx_skb_queue);
+       {
+               int i;
+               size_t tmpaddr = 0;
+               size_t alignment = 0;
+               struct sk_buff *pskb = NULL;
+
+               skb_queue_head_init(&precvpriv->free_recv_skb_queue);
+
+               for (i = 0; i < NR_PREALLOC_RECV_SKB; i++) {
+                       pskb = __netdev_alloc_skb(padapter->pnetdev,
+                                                 MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ, GFP_KERNEL);
+                       if (pskb) {
+                               pskb->dev = padapter->pnetdev;
+                               tmpaddr = (size_t)pskb->data;
+                               alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
+                               skb_reserve(pskb, (RECVBUFF_ALIGN_SZ - alignment));
+
+                               skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb);
+                       }
+                       pskb = NULL;
+               }
+       }
+exit:
+       return res;
+}
+
 int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 {
        int i;
@@ -91,6 +150,26 @@ exit:
        return res;
 }
 
+static void rtl8188eu_free_recv_priv(struct adapter *padapter)
+{
+       int i;
+       struct recv_buf *precvbuf;
+       struct recv_priv *precvpriv = &padapter->recvpriv;
+
+       precvbuf = (struct recv_buf *)precvpriv->precv_buf;
+
+       for (i = 0; i < NR_RECVBUFF; i++) {
+               rtw_os_recvbuf_resource_free(padapter, precvbuf);
+               precvbuf++;
+       }
+
+       kfree(precvpriv->pallocated_recv_buf);
+
+       skb_queue_purge(&precvpriv->rx_skb_queue);
+
+       skb_queue_purge(&precvpriv->free_recv_skb_queue);
+}
+
 void _rtw_free_recv_priv(struct recv_priv *precvpriv)
 {
        struct adapter  *padapter = precvpriv->adapter;

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
deleted file mode 100644 (file)
index def6d0d..0000000
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ /dev/null
@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 2007 - 2011 Realtek Corporation. */
-
-#define _RTL8188EU_RECV_C_
-#include "../include/osdep_service.h"
-#include "../include/drv_types.h"
-#include "../include/recv_osdep.h"
-#include "../include/mlme_osdep.h"
-
-#include "../include/usb_ops.h"
-#include "../include/wifi.h"
-
-#include "../include/rtl8188e_hal.h"
-
-int    rtl8188eu_init_recv_priv(struct adapter *padapter)
-{
-       struct recv_priv        *precvpriv = &padapter->recvpriv;
-       int     i, res = _SUCCESS;
-       struct recv_buf *precvbuf;
-
-       tasklet_init(&precvpriv->recv_tasklet,
-                    rtl8188eu_recv_tasklet,
-                    (unsigned long)padapter);
-
-       /* init recv_buf */
-       rtw_init_queue(&precvpriv->free_recv_buf_queue);
-
-       precvpriv->pallocated_recv_buf = kzalloc(NR_RECVBUFF * sizeof(struct recv_buf) + 4,
-                                                GFP_KERNEL);
-       if (!precvpriv->pallocated_recv_buf) {
-               res = _FAIL;
-               goto exit;
-       }
-
-       precvpriv->precv_buf = (u8 *)ALIGN((size_t)(precvpriv->pallocated_recv_buf), 4);
-
-       precvbuf = (struct recv_buf *)precvpriv->precv_buf;
-
-       for (i = 0; i < NR_RECVBUFF; i++) {
-               res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf);
-               if (res == _FAIL)
-                       break;
-               precvbuf->adapter = padapter;
-               precvbuf++;
-       }
-       precvpriv->free_recv_buf_queue_cnt = NR_RECVBUFF;
-       skb_queue_head_init(&precvpriv->rx_skb_queue);
-       {
-               int i;
-               size_t tmpaddr = 0;
-               size_t alignment = 0;
-               struct sk_buff *pskb = NULL;
-
-               skb_queue_head_init(&precvpriv->free_recv_skb_queue);
-
-               for (i = 0; i < NR_PREALLOC_RECV_SKB; i++) {
-                       pskb = __netdev_alloc_skb(padapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ, GFP_KERNEL);
-                       if (pskb) {
-                               pskb->dev = padapter->pnetdev;
-                               tmpaddr = (size_t)pskb->data;
-                               alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
-                               skb_reserve(pskb, (RECVBUFF_ALIGN_SZ - alignment));
-
-                               skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb);
-                       }
-                       pskb = NULL;
-               }
-       }
-exit:
-       return res;
-}
-
-void rtl8188eu_free_recv_priv(struct adapter *padapter)
-{
-       int     i;
-       struct recv_buf *precvbuf;
-       struct recv_priv        *precvpriv = &padapter->recvpriv;
-
-       precvbuf = (struct recv_buf *)precvpriv->precv_buf;
-
-       for (i = 0; i < NR_RECVBUFF; i++) {
-               rtw_os_recvbuf_resource_free(padapter, precvbuf);
-               precvbuf++;
-       }
-
-       kfree(precvpriv->pallocated_recv_buf);
-
-       skb_queue_purge(&precvpriv->rx_skb_queue);
-
-       skb_queue_purge(&precvpriv->free_recv_skb_queue);
-}

diff --git a/drivers/staging/r8188eu/include/rtl8188e_recv.h b/drivers/staging/r8188eu/include/rtl8188e_recv.h
index b752c5c06309be1da6b09bde737cb1d91b674636..dc4f358f646d46334117745de3183a84acd2e2d4 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_recv.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_recv.h
@@ -33,8 +33,6 @@ enum rx_packet_type {
        HIS_REPORT,/*  USB HISR RPT */
 };
 
-s32 rtl8188eu_init_recv_priv(struct adapter *padapter);
-void rtl8188eu_free_recv_priv(struct adapter * padapter);
 void rtl8188eu_recv_tasklet(unsigned long priv);
 void update_recvframe_phyinfo_88e(struct recv_frame *fra, struct phy_stat *phy);
 void update_recvframe_attrib_88e(struct recv_frame *fra, struct recv_stat *stat);