Skip to contentSkip to conversation

staging: r8188eu: make some functions static

PATCH In review Michael Straube 2 participants 4 messages Aug 4, 2022 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

cover staging: r8188eu: make some functions static

This series makes some functions static what allows us to remove the files hal/rtl8188e_xmit.c and hal/rtl8188eu_recv.c.

Michael Straube (2):
staging: r8188eu: make handle_txrpt_ccx_88e() static
staging: r8188eu: make rtl8188eu_{init,free}_recv_priv() static

 drivers/staging/r8188eu/Makefile              |  2 -
 drivers/staging/r8188eu/core/rtw_recv.c       | 79 ++++++++++++++++
 drivers/staging/r8188eu/hal/rtl8188e_xmit.c   | 22 -----
 drivers/staging/r8188eu/hal/rtl8188eu_recv.c  | 91 -------------------
 drivers/staging/r8188eu/hal/usb_ops_linux.c   | 14 +++
 .../staging/r8188eu/include/rtl8188e_recv.h   |  2 -
 .../staging/r8188eu/include/rtl8188e_xmit.h   |  2 -
 7 files changed, 93 insertions(+), 119 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c
 delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c
Signature · 1 line
2.37.1
author
#1 lore raw

PATCH 1/2 staging: r8188eu: make handle_txrpt_ccx_88e() static

The function handle_txrpt_ccx_88e() is only used in usb_ops_linux.c. Make it static and remove the now empty file rtl8188e_xmit.c.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/Makefile              |  1 -
 drivers/staging/r8188eu/hal/rtl8188e_xmit.c   | 22 -------------------
 drivers/staging/r8188eu/hal/usb_ops_linux.c   | 14 ++++++++++++
 .../staging/r8188eu/include/rtl8188e_xmit.h   |  2 --
 4 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c
drivers/staging/r8188eu/Makefile +0 -1
index eea16eb7caa0..cddfee3efd36 100644
@@ -18,7 +18,6 @@ r8188eu-y = \
 		hal/rtl8188e_phycfg.o \
 		hal/rtl8188e_rf6052.o \
 		hal/rtl8188e_rxdesc.o \
-		hal/rtl8188e_xmit.o \
 		hal/rtl8188eu_recv.o \
 		hal/rtl8188eu_xmit.o \
 		hal/usb_halinit.o \
drivers/staging/r8188eu/hal/rtl8188e_xmit.c deleted +0 -22
deleted file mode 100644
index 46b871f3f631..000000000000
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 2007 - 2011 Realtek Corporation. */
-
-#define _RTL8188E_XMIT_C_
-
-#include "../include/osdep_service.h"
-#include "../include/drv_types.h"
-#include "../include/rtl8188e_hal.h"
-
-void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf)
-{
-	struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
-
-	if (txrpt_ccx->int_ccx) {
-		if (txrpt_ccx->pkt_ok)
-			rtw_ack_tx_done(&adapter->xmitpriv,
-					RTW_SCTX_DONE_SUCCESS);
-		else
-			rtw_ack_tx_done(&adapter->xmitpriv,
-					RTW_SCTX_DONE_CCX_PKT_FAIL);
-	}
-}
drivers/staging/r8188eu/hal/usb_ops_linux.c +14 -0
index c1a4d023f627..f29bfa948ce7 100644
@@ -190,6 +190,20 @@ int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data)
 	return RTW_STATUS_CODE(ret);
 }
 
+static void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf)
+{
+	struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
+
+	if (txrpt_ccx->int_ccx) {
+		if (txrpt_ccx->pkt_ok)
+			rtw_ack_tx_done(&adapter->xmitpriv,
+					RTW_SCTX_DONE_SUCCESS);
+		else
+			rtw_ack_tx_done(&adapter->xmitpriv,
+					RTW_SCTX_DONE_CCX_PKT_FAIL);
+	}
+}
+
 static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
 {
 	u8	*pbuf;
drivers/staging/r8188eu/include/rtl8188e_xmit.h +0 -2
index 8adb672f7a07..c69fed23ded9 100644
@@ -147,6 +147,4 @@ bool rtl8188eu_xmitframe_complete(struct adapter *padapter,
 				 struct xmit_priv *pxmitpriv,
 				 struct xmit_buf *pxmitbuf);
 
-void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf);
-
 #endif /* __RTL8188E_XMIT_H__ */
Signature · 1 line
2.37.1
author
#2 lore raw

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

In reply to Michael Straube

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.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/Makefile              |  1 -
 drivers/staging/r8188eu/core/rtw_recv.c       | 79 ++++++++++++++++
 drivers/staging/r8188eu/hal/rtl8188eu_recv.c  | 91 -------------------
 .../staging/r8188eu/include/rtl8188e_recv.h   |  2 -
 4 files changed, 79 insertions(+), 94 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c
drivers/staging/r8188eu/Makefile +0 -1
index cddfee3efd36..b118fd9b695c 100644
@@ -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 \
drivers/staging/r8188eu/core/rtw_recv.c +79 -0

91 lines not on this page · raw message

drivers/staging/r8188eu/hal/rtl8188eu_recv.c deleted +0 -91

91 lines not on this page · raw message

drivers/staging/r8188eu/include/rtl8188e_recv.h +0 -2
index b752c5c06309..dc4f358f646d 100644
@@ -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);
Signature · 1 line
2.37.1
Tested-by on the v1 series
#3 lore raw
In reply to Michael Straube
Quoted 15 lines · Michael Straube

This series makes some functions static what allows us to remove the files hal/rtl8188e_xmit.c and hal/rtl8188eu_recv.c.

Michael Straube (2):
staging: r8188eu: make handle_txrpt_ccx_88e() static
staging: r8188eu: make rtl8188eu_{init,free}_recv_priv() static

  drivers/staging/r8188eu/Makefile              |  2 -
  drivers/staging/r8188eu/core/rtw_recv.c       | 79 ++++++++++++++++
  drivers/staging/r8188eu/hal/rtl8188e_xmit.c   | 22 -----
  drivers/staging/r8188eu/hal/rtl8188eu_recv.c  | 91 -------------------
  drivers/staging/r8188eu/hal/usb_ops_linux.c   | 14 +++
  .../staging/r8188eu/include/rtl8188e_recv.h   |  2 -
  .../staging/r8188eu/include/rtl8188e_xmit.h   |  2 -
  7 files changed, 93 insertions(+), 119 deletions(-)
Quoted 3 lines

delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c

Tested-by Philipp Hortmann <[email protected]> # Edimax N150