From nobody Sat Sep 13 00:03:06 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 9D386C636D3 for ; Tue, 7 Feb 2023 19:23:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232321AbjBGTXw (ORCPT ); Tue, 7 Feb 2023 14:23:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231405AbjBGTXs (ORCPT ); Tue, 7 Feb 2023 14:23:48 -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 EEF4039CDA for ; Tue, 7 Feb 2023 11:23:42 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTZ3-0002XK-08; Tue, 07 Feb 2023 20:23:37 +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 5/7] staging: r8188eu: simplify xmit_buf flags Date: Tue, 7 Feb 2023 20:23:17 +0100 Message-Id: <20230207192319.294203-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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" rtw_write_port stores a queue index in pxmitbuf->flags before submitting an urb. The urb completion function reads the flags. All it needs is the info if the high queue was used or not. We can replace the flags with a boolean high_queue variable. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 2 +- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- .../staging/r8188eu/os_dep/usb_ops_linux.c | 25 ++----------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 6ec342b726f9..df88b3e29e77 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -148,7 +148,7 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) goto free_xmitbuf; } =20 - pxmitbuf->flags =3D XMIT_VO_QUEUE; + pxmitbuf->high_queue =3D false; =20 list_add_tail(&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue); pxmitbuf++; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 9a001fbf45a0..feeac85aedb0 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -189,7 +189,7 @@ struct xmit_buf { u8 *pbuf; void *priv_data; u16 ext_tag; /* 0: Normal xmitbuf, 1: extension xmitbuf. */ - u16 flags; + bool high_queue; u32 alloc_sz; u32 len; struct submit_ctx *sctx; diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/stagi= ng/r8188eu/os_dep/usb_ops_linux.c index 48c96f731ce1..ca09f7ed7e4d 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -39,7 +39,7 @@ static void usb_write_port_complete(struct urb *purb) struct adapter *padapter =3D pxmitbuf->padapter; struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; =20 - if (pxmitbuf->flags =3D=3D HIGH_QUEUE_INX) + if (pxmitbuf->high_queue) rtw_chk_hi_queue_cmd(padapter); =20 switch (purb->status) { @@ -83,28 +83,7 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u= 32 cnt, u8 *wmem) } =20 spin_lock_irqsave(&pxmitpriv->lock, irqL); - - switch (addr) { - case VO_QUEUE_INX: - pxmitbuf->flags =3D VO_QUEUE_INX; - break; - case VI_QUEUE_INX: - pxmitbuf->flags =3D VI_QUEUE_INX; - break; - case BE_QUEUE_INX: - pxmitbuf->flags =3D BE_QUEUE_INX; - break; - case BK_QUEUE_INX: - pxmitbuf->flags =3D BK_QUEUE_INX; - break; - case HIGH_QUEUE_INX: - pxmitbuf->flags =3D HIGH_QUEUE_INX; - break; - default: - pxmitbuf->flags =3D MGT_QUEUE_INX; - break; - } - + pxmitbuf->high_queue =3D (addr =3D=3D HIGH_QUEUE_INX); spin_unlock_irqrestore(&pxmitpriv->lock, irqL); =20 purb =3D pxmitbuf->pxmit_urb; --=20 2.30.2