diff mbox series

[05/20] staging: r8188eu: remove unused parameter

Message ID	20221230180646.91008-6-martin@kaiser.cx
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Martin Kaiser <martin@kaiser.cx> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Larry Finger <Larry.Finger@lwfinger.net>, Phillip Potter <phil@philpotter.co.uk>, Michael Straube <straube.linux@gmail.com>, Pavel Skripkin <paskripkin@gmail.com>, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx> Subject: [PATCH 05/20] staging: r8188eu: remove unused parameter Date: Fri, 30 Dec 2022 19:06:31 +0100 Message-Id: <20221230180646.91008-6-martin@kaiser.cx> In-Reply-To: <20221230180646.91008-1-martin@kaiser.cx> References: <20221230180646.91008-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	staging: r8188eu: some xmit cleanups \| [00/20] staging: r8188eu: some xmit cleanups [01/20] staging: r8188eu: make xmitframe_swencrypt a void function [02/20] staging: r8188eu: remove some unused CAM defines [03/20] staging: r8188eu: cmd_seq is write-only [04/20] staging: r8188eu: return immediately if we're not meant to encrypt [05/20] staging: r8188eu: remove unused parameter [06/20] staging: r8188eu: simplify rtl8188eu_xmit_tasklet [07/20] staging: r8188eu: remove rtl8188eu_init_xmit_priv [08/20] staging: r8188eu: remove duplicate psta check [09/20] staging: r8188eu: simplify frame type check [10/20] staging: r8188eu: simplify rtw_make_wlanhdr's error handling [11/20] staging: r8188eu: clean up qos_option setting [12/20] staging: r8188eu: remove unused bpending array [13/20] staging: r8188eu: remove unused dma_transfer_addr [14/20] staging: r8188eu: bm_pending is not used [15/20] staging: r8188eu: terminate_xmitthread_sema is not used [16/20] staging: r8188eu: tx_retevt semaphore is not used [17/20] staging: r8188eu: remove unnecessary rtw_free_xmitframe call [18/20] staging: r8188eu: phwxmit parameter is unused [19/20] staging: r8188eu: rtw_init_hwxmits is not needed [20/20] staging: r8188eu: we use a constant number of hw_xmit entries

Commit Message

Martin Kaiser Dec. 30, 2022, 6:06 p.m. UTC

  All callers of rtl8188eu_xmitframe_complete set the pxmitbuf parameter to
NULL, in which case rtl8188eu_xmitframe_complete allocates another
xmit_buf internally.

Remove the pxmitbuf parameter and resulting dead code.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/hal/rtl8188eu_xmit.c    | 12 +++++-------
 drivers/staging/r8188eu/hal/usb_ops_linux.c     |  2 +-
 drivers/staging/r8188eu/include/rtl8188e_xmit.h |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index 6d1f56d1f9d7..cca74cf28915 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -375,11 +375,12 @@  static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
 	return len;
 }
 
-bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
+bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpriv)
 {
 	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(adapt);
 	struct xmit_frame *pxmitframe = NULL;
 	struct xmit_frame *pfirstframe = NULL;
+	struct xmit_buf *pxmitbuf;
 
 	/*  aggregate variable */
 	struct hw_xmit *phwxmit;
@@ -403,12 +404,9 @@  bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit
 	else
 		bulksize = USB_FULL_SPEED_BULK_SIZE;
 
-	/*  check xmitbuffer is ok */
-	if (!pxmitbuf) {
-		pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
-		if (!pxmitbuf)
-			return false;
-	}
+	pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
+	if (!pxmitbuf)
+		return false;
 
 	/* 3 1. pick up first frame */
 	rtw_free_xmitframe(pxmitpriv, pxmitframe);
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 7c72f5e04d9b..c51f860d3527 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -494,7 +494,7 @@  void rtl8188eu_xmit_tasklet(unsigned long priv)
 		    (adapt->bWritePortCancel))
 			break;
 
-		ret = rtl8188eu_xmitframe_complete(adapt, pxmitpriv, NULL);
+		ret = rtl8188eu_xmitframe_complete(adapt, pxmitpriv);
 
 		if (!ret)
 			break;
diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
index 6db7fabebea9..865468d6b922 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
@@ -138,7 +138,6 @@  s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);
 #define hal_xmit_handler rtl8188eu_xmit_buf_handler
 void rtl8188eu_xmit_tasklet(unsigned long priv);
 bool rtl8188eu_xmitframe_complete(struct adapter *padapter,
-				 struct xmit_priv *pxmitpriv,
-				 struct xmit_buf *pxmitbuf);
+				 struct xmit_priv *pxmitpriv);
 
 #endif /* __RTL8188E_XMIT_H__ */