From nobody Tue Sep 16 20:00:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38B63C4167B for ; Fri, 30 Dec 2022 18:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235467AbiL3SH2 (ORCPT ); Fri, 30 Dec 2022 13:07:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235421AbiL3SHP (ORCPT ); Fri, 30 Dec 2022 13:07:15 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B505C60E2 for ; Fri, 30 Dec 2022 10:07:14 -0800 (PST) Received: from dslb-188-097-208-179.188.097.pools.vodafone-ip.de ([188.97.208.179] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1pBJmf-0004rR-Ve; Fri, 30 Dec 2022 19:07:10 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser 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> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221230180646.91008-1-martin@kaiser.cx> References: <20221230180646.91008-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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 --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 *p= xmitframe) return len; } =20 -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 =3D adapter_to_dvobj(adapt); struct xmit_frame *pxmitframe =3D NULL; struct xmit_frame *pfirstframe =3D NULL; + struct xmit_buf *pxmitbuf; =20 /* aggregate variable */ struct hw_xmit *phwxmit; @@ -403,12 +404,9 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adap= t, struct xmit_priv *pxmit else bulksize =3D USB_FULL_SPEED_BULK_SIZE; =20 - /* check xmitbuffer is ok */ - if (!pxmitbuf) { - pxmitbuf =3D rtw_alloc_xmitbuf(pxmitpriv); - if (!pxmitbuf) - return false; - } + pxmitbuf =3D rtw_alloc_xmitbuf(pxmitpriv); + if (!pxmitbuf) + return false; =20 /* 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; =20 - ret =3D rtl8188eu_xmitframe_complete(adapt, pxmitpriv, NULL); + ret =3D rtl8188eu_xmitframe_complete(adapt, pxmitpriv); =20 if (!ret) break; diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/stag= ing/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); =20 #endif /* __RTL8188E_XMIT_H__ */ --=20 2.30.2