From nobody Sat Apr 11 21:30:21 2026 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 5E0F2C19F2D for ; Sat, 6 Aug 2022 19:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232530AbiHFT4L (ORCPT ); Sat, 6 Aug 2022 15:56:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232932AbiHFT4A (ORCPT ); Sat, 6 Aug 2022 15:56:00 -0400 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 7850A6437 for ; Sat, 6 Aug 2022 12:55:59 -0700 (PDT) Received: from dslb-188-097-043-167.188.097.pools.vodafone-ip.de ([188.97.43.167] 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 1oKPtp-0004Tu-Rb; Sat, 06 Aug 2022 21:55:53 +0200 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/13] staging: r8188eu: summarize endpoint-related settings Date: Sat, 6 Aug 2022 21:55:32 +0200 Message-Id: <20220806195540.777390-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220806195540.777390-1-martin@kaiser.cx> References: <20220806195540.777390-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" rtl8188eu_interface_configure calls _ConfigNormalChipOutEP_8188E and Hal_MappingOutPipe. Both of these functions make some settings based on the number of out endpoints on the 8188eu chip. We can merge both of them into rtl8188eu_interface_configure and summarize the common code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 55 +++++++---------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 8be93c44c903..603108a5d794 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -13,28 +13,6 @@ #include "../include/usb_osintf.h" #include "../include/HalPwrSeqCmd.h" =20 -static void _ConfigNormalChipOutEP_8188E(struct adapter *adapt, u8 NumOutP= ipe) -{ - struct hal_data_8188e *haldata =3D &adapt->haldata; - - switch (NumOutPipe) { - case 3: - haldata->OutEpQueueSel =3D TX_SELE_HQ | TX_SELE_LQ | TX_SELE_NQ; - haldata->OutEpNumber =3D 3; - break; - case 2: - haldata->OutEpQueueSel =3D TX_SELE_HQ | TX_SELE_NQ; - haldata->OutEpNumber =3D 2; - break; - case 1: - haldata->OutEpQueueSel =3D TX_SELE_HQ; - haldata->OutEpNumber =3D 1; - break; - default: - break; - } -} - static void one_out_pipe(struct adapter *adapter) { struct dvobj_priv *pdvobjpriv =3D adapter_to_dvobj(adapter); @@ -122,33 +100,34 @@ static void three_out_pipe(struct adapter *adapter, b= ool wifi_cfg) } } =20 -static int Hal_MappingOutPipe(struct adapter *adapter, u8 numoutpipe) +int rtl8188eu_interface_configure(struct adapter *adapt) { - struct registry_priv *pregistrypriv =3D &adapter->registrypriv; + struct registry_priv *pregistrypriv =3D &adapt->registrypriv; + struct dvobj_priv *pdvobjpriv =3D adapter_to_dvobj(adapt); + struct hal_data_8188e *haldata =3D &adapt->haldata; bool wifi_cfg =3D pregistrypriv->wifi_spec; =20 - switch (numoutpipe) { - case 2: - two_out_pipe(adapter, wifi_cfg); - break; + switch (pdvobjpriv->RtNumOutPipes) { case 3: - three_out_pipe(adapter, wifi_cfg); + haldata->OutEpQueueSel =3D TX_SELE_HQ | TX_SELE_LQ | TX_SELE_NQ; + haldata->OutEpNumber =3D 3; + three_out_pipe(adapt, wifi_cfg); + break; + case 2: + haldata->OutEpQueueSel =3D TX_SELE_HQ | TX_SELE_NQ; + haldata->OutEpNumber =3D 2; + two_out_pipe(adapt, wifi_cfg); break; case 1: - one_out_pipe(adapter); + haldata->OutEpQueueSel =3D TX_SELE_HQ; + haldata->OutEpNumber =3D 1; + one_out_pipe(adapt); break; default: return -ENXIO; } - return 0; -} =20 -int rtl8188eu_interface_configure(struct adapter *adapt) -{ - struct dvobj_priv *pdvobjpriv =3D adapter_to_dvobj(adapt); - - _ConfigNormalChipOutEP_8188E(adapt, pdvobjpriv->RtNumOutPipes); - return Hal_MappingOutPipe(adapt, pdvobjpriv->RtNumOutPipes); + return 0; } =20 u32 rtl8188eu_InitPowerOn(struct adapter *adapt) --=20 2.30.2