From nobody Mon Jun 29 23:23:12 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 6ED6CC433EF for ; Tue, 1 Feb 2022 08:43:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235698AbiBAInX (ORCPT ); Tue, 1 Feb 2022 03:43:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235597AbiBAInN (ORCPT ); Tue, 1 Feb 2022 03:43:13 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6E9CC061401 for ; Tue, 1 Feb 2022 00:43:12 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id p7so32522270edc.12 for ; Tue, 01 Feb 2022 00:43:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ncQM3kR+4xDnKchoBNvVQ7NuD29eMdEQFRmCBoUrMNQ=; b=ocPh9Vv8GXsorx9D71qIpRemoGa6o4fX6mLS8AS1YzM+uQV87f7BbX9tVNh769gexF mQQ0qC5tXP+IAuSDDoDiMDMRBPeyRMPdbuGMSXI5qFTOoRGARmkQ9GWNsvVZ0iRh5KxM vdI/Z8QP41/i7vfgbZWvQRY2ofc93HYkdoEAHV0uqmncphVT4iaNzoOQUdWnswiijLzs JocAgyzvN5ymPPpVSmXNRFBPebbZO9AeoHlP/RFtJJHMCiYgmSEc1cWzt+Ov0nHMJRkP N6KSSEgnr+znfgYIVFj2hTlXkZEZlKsq4HqJBP/Z4iiwKr+dsLVjJl3k3t+bqV0zPWDj nBBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ncQM3kR+4xDnKchoBNvVQ7NuD29eMdEQFRmCBoUrMNQ=; b=pcbrMlTABz3pBoTYJ9B8OsYlNrNX1MgAgkLIhrDWuzwMlq/0UUULi/ykV8NZ2hF9Nl NeBJtcUXToJ2EpshWqb6y8ss3LNRdLB/yj1Ak8GmI+cLVC3G2Sf1T86yaNbiebvc25HX KnGH26EYAj52D5aw3gMGlrxhyqiNZVr+1b9XDBVq0m+uSybEYqbzkxZebnvw4+yt0RbL iGjkLGYW3LAY415xujMLY4CcHQxG5Zw3S4BLlrCltFQzhkYVM799ME3rC3LUscFJqymK 9I6VLowJMk+AjlJzaNkI/jliXBwf8APYRNmn8R4a0E4MC1gZOnP5/cNfdNNLAlRd8Dpz zdvw== X-Gm-Message-State: AOAM5329I44rXTAiMDgSdpWiwm1jQkRi/9XajjZqI2DBsU3LOgzgWSUM oPG3xECe9bzEwVsV6pS9mvjv6Usyefo= X-Google-Smtp-Source: ABdhPJwIg5jbispX3rgtrezqUBDa6jzoU0VMREInkbZara5ttVyl5pTB9gQ0Gy34GHmXBSX2U14WuA== X-Received: by 2002:a05:6402:348a:: with SMTP id v10mr24361875edc.249.1643704991500; Tue, 01 Feb 2022 00:43:11 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:11 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/9] staging: r8188eu: ExternalPA is read-only Date: Tue, 1 Feb 2022 09:42:51 +0100 Message-Id: <20220201084259.7497-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" The variable ExternalPA in struct hal_data_8188e is never set. It stays at the default value 0. Remove it and remove related dead code. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 3 --- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index d10a6cc2d4ab..9b06a23df2ac 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -99,9 +99,6 @@ rtl8188e_PHY_RF6052SetCckTxPower( TxAGC[idx1] =3D pPowerlevel[idx1] | (pPowerlevel[idx1] << 8) | (pPowerlevel[idx1] << 16) | (pPowerlevel[idx1] << 24); - /* 2010/10/18 MH For external PA module. We need to limit power index = to be less than 0x20. */ - if (TxAGC[idx1] > 0x20 && pHalData->ExternalPA) - TxAGC[idx1] =3D 0x20; } } else { for (idx1 =3D RF_PATH_A; idx1 <=3D RF_PATH_B; idx1++) { diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index a24cdbfa83de..2de7c0464411 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -181,7 +181,6 @@ struct hal_data_8188e { u32 MCSTxPowerLevelOriginalOffset[MAX_PG_GROUP][16]; =20 u8 CrystalCap; - u8 ExternalPA; =20 u32 AcParam_BE; /* Original parameter for BE, use for EDCA turbo. */ =20 --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 2EFB7C433EF for ; Tue, 1 Feb 2022 08:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235626AbiBAInQ (ORCPT ); Tue, 1 Feb 2022 03:43:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234299AbiBAInN (ORCPT ); Tue, 1 Feb 2022 03:43:13 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E3F6C061714 for ; Tue, 1 Feb 2022 00:43:13 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id c24so32918793edy.4 for ; Tue, 01 Feb 2022 00:43:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=08thSjsgd1AJJVXbNNLuNDEbPWt749B6BX7mkpr4V3o=; b=kSKHoRyVchCr9vi0DKFilMcjnyIIfwONZLBn9uxTfv1ggMfpgtyvHl5LgNCmsrqLLm U2G3IdDO2Sroe6/gbvyCjV8j8ZWttXZZ39avQ2ZpyY/V3Dvhv8CSjW9SNoIMfkY/0Nhf ehwElTrXFdTVtZwOLvR+JvBsp/i5JMb2KKGuSo9I/VjGrVbnutrUUbKSEMP0pMi7DW5P u204ZBFZdLOG/pyAD3Bcb5aKhXerl0a0sdAYcSLKaDa4XGVlV781LVt/+LwRLjRlNd5C 4IXLx9uiUikUgSh9FMPcgwmz3aentygoo1+oRldykPZ46K4ViSCBfeiPLZ/HPCbPDQTd PeNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=08thSjsgd1AJJVXbNNLuNDEbPWt749B6BX7mkpr4V3o=; b=qkcvXEWxp81R9+5DdSjvSlSSWBkbb0zlKBFaqXf32wFaOdc9ct4U7wvDaHfW0vk4to nNrqChb+bNlJ3XXybk1ItM1kiPDIWo+Ex3V4kWcJ/NeWVoh0b3NN8eXs/8BOxEZBpaKa QecboS7KzN3ckdwVk6eeWrF6YXaWz0VDXUJw6+e39j2PBKTeF0VIooSItzooiNvO9DP5 D3Mqgw218kqkueh8GLWfJya2Rg6IHGisc/reoEMtQEo8ZxbRnZRdosfFGOFi7PoQHEXW 4rj+2KPvOFFNJXLW8sXmYKWS8ls4rAfDFaTDxZ/2fv04lSeFnLD5TmJWZrA8Dvy0aj4L rIdQ== X-Gm-Message-State: AOAM530ji7R7V10I6oFyI//FfMnPnuNDz37Y8+RFmGT3M/fM+DUrovPX 9kUjVHgPhHFw+sdxPOKWXOGV35+4ogM= X-Google-Smtp-Source: ABdhPJw06DCVkCUqXomP7kIF/fgeasEVzVcSC+tzC6zr42aD2TnRVzeMXMx0vZwyDvIK18ko3l8xVA== X-Received: by 2002:a05:6402:34c7:: with SMTP id w7mr24203551edc.397.1643704992264; Tue, 01 Feb 2022 00:43:12 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:11 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/9] staging: r8188eu: remove PGMaxGroup from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:52 +0100 Message-Id: <20220201084259.7497-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" the variable PGMaxGroup in struct hal_data_8188e is set to 13 and never changed. We can use the already defined constant MAX_PG_GROUP, which is 13, and remove PGMaxGroup from struct hal_data_8188e. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 1 - drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index 9b06a23df2ac..ea847ec39e13 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -200,7 +200,7 @@ static void get_rx_power_val_by_reg(struct adapter *Ada= pter, u8 Channel, /* increase power diff defined by Realtek for regulatory */ if (pHalData->pwrGroupCnt =3D=3D 1) chnlGroup =3D 0; - if (pHalData->pwrGroupCnt >=3D pHalData->PGMaxGroup) { + if (pHalData->pwrGroupCnt >=3D MAX_PG_GROUP) { if (Channel < 3) /* Channel 1-2 */ chnlGroup =3D 0; else if (Channel < 6) /* Channel 3-5 */ diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 0fdade585d25..91b854c7b9a1 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1738,7 +1738,6 @@ void rtl8188eu_init_default_value(struct adapter *ada= pt) haldata->odmpriv.RFCalibrateInfo.bIQKInitialized =3D false; haldata->odmpriv.RFCalibrateInfo.TM_Trigger =3D 0;/* for IQK */ haldata->pwrGroupCnt =3D 0; - haldata->PGMaxGroup =3D 13; haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP_index =3D 0; for (i =3D 0; i < HP_THERMAL_NUM; i++) haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] =3D 0; diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 2de7c0464411..661c447a0453 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -150,7 +150,6 @@ struct txpowerinfo24g { =20 struct hal_data_8188e { struct HAL_VERSION VersionID; - u8 PGMaxGroup; /* current WIFI_PHY values */ u32 ReceiveConfig; enum ht_channel_width CurrentChannelBW; --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 AB002C433F5 for ; Tue, 1 Feb 2022 08:43:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235739AbiBAIn0 (ORCPT ); Tue, 1 Feb 2022 03:43:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235609AbiBAInO (ORCPT ); Tue, 1 Feb 2022 03:43:14 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52554C061714 for ; Tue, 1 Feb 2022 00:43:14 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id s5so51553054ejx.2 for ; Tue, 01 Feb 2022 00:43:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vPQCFVUGDeDMouS1odhJlOYowD2BZ8XAZv0e1KiFcMo=; b=nJcTaD/F0+VZC2ybxywaJf7H0PwTo7aCzxgk9dVSrGKWlo20fo5rvndS+5shAyM7gq LreNSVdToXdQx4fcD84XRMJrjYloOdma44WtUODA9YqsIaEZAuwZ3vQ8dj42CkFEjmui bBrOqQKTM6Qqs/eQTxL0qWbrTj8XK/ZRLFRcJMgstRWD76y71PJF2XYmjOGJ8EWaC29P 3GH5M9gplz37Iarer4/JB4eYQ8CstWfcYfcrdGpJMHMbuiJyo4iNAr0cDmLODUeQkvB6 0iqYoHmh2J7AZ2TkyUxYWgLbgMzKhlTrGjjyElfwUAhl5TsU/Ad6fyXJtlFtu1ml9wuY 4Slw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vPQCFVUGDeDMouS1odhJlOYowD2BZ8XAZv0e1KiFcMo=; b=k1NyDs0QN2oBGCMQXYQK2WGJ85bNNrZ7YQkD2L6QZEJKkN+IZEL1QpnRIBzwkEELsv 9j4fr/d7jj/6yNUmeyuOU30FjKTD1YgsFCQ5L2+OCC2hSJ8N5mDI39s7Ecy6cOmdgp69 nnPG3weDMOg+HqJvqyY39OcsCspL2VYJN1uJGwgepoARLquAK3BSdrBb9Y66qnT1p/T0 BniDbECfFJl4XDOxoicVI8oqg5lir+N77f/nu8Yl4S1EyqUu7O3M1yfwq0vzK3+a1Ktd S463KXPCpX4+Try88iYuCJWZHJ78+O31k9juyULhADgJdPHVk9sNzoTex8PmQUIlnKaS EDig== X-Gm-Message-State: AOAM5321Nf2kHq0QcgXNcif4Gn5Z7sMK7rNo9ogKI1hKwXu9wGhtH+fC cUDMVymVxg7JQu1N0mCcG/s= X-Google-Smtp-Source: ABdhPJzLIKmai4++TF1kULNC15dnHMhxMezgP2z433alncp1QshFpkCsfuz6oLyJFtCEK/+j41WmpQ== X-Received: by 2002:a17:907:6290:: with SMTP id nd16mr19760537ejc.33.1643704992960; Tue, 01 Feb 2022 00:43:12 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:12 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/9] staging: r8188eu: remove ReceiveConfig from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:53 +0100 Message-Id: <20220201084259.7497-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" The ReceiveConfig variable in struct hal_data_8188e is only used to store a local value. Use a local variable instead and remove ReceiveConfig from struct hal_data_8188e. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 12 +++++------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 91b854c7b9a1..2252e8a1d55b 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -324,15 +324,13 @@ static void _InitDriverInfoSize(struct adapter *Adapt= er, u8 drvInfoSize) =20 static void _InitWMACSetting(struct adapter *Adapter) { - struct hal_data_8188e *haldata =3D &Adapter->haldata; - - haldata->ReceiveConfig =3D RCR_AAP | RCR_APM | RCR_AM | RCR_AB | - RCR_CBSSID_DATA | RCR_CBSSID_BCN | - RCR_APP_ICV | RCR_AMF | RCR_HTC_LOC_CTRL | - RCR_APP_MIC | RCR_APP_PHYSTS; + u32 receive_config =3D RCR_AAP | RCR_APM | RCR_AM | RCR_AB | + RCR_CBSSID_DATA | RCR_CBSSID_BCN | + RCR_APP_ICV | RCR_AMF | RCR_HTC_LOC_CTRL | + RCR_APP_MIC | RCR_APP_PHYSTS; =20 /* some REG_RCR will be modified later by phy_ConfigMACWithHeaderFile() = */ - rtw_write32(Adapter, REG_RCR, haldata->ReceiveConfig); + rtw_write32(Adapter, REG_RCR, receive_config); =20 /* Accept all multicast address */ rtw_write32(Adapter, REG_MAR, 0xFFFFFFFF); diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 661c447a0453..88246ef65f8a 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -151,7 +151,6 @@ struct txpowerinfo24g { struct hal_data_8188e { struct HAL_VERSION VersionID; /* current WIFI_PHY values */ - u32 ReceiveConfig; enum ht_channel_width CurrentChannelBW; u8 CurrentChannel; u8 nCur40MhzPrimeSC;/* Control channel sub-carrier */ --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 5D49DC4332F for ; Tue, 1 Feb 2022 08:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235632AbiBAIn3 (ORCPT ); Tue, 1 Feb 2022 03:43:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235606AbiBAInP (ORCPT ); Tue, 1 Feb 2022 03:43:15 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B8A0C061741 for ; Tue, 1 Feb 2022 00:43:15 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id u24so32341554eds.11 for ; Tue, 01 Feb 2022 00:43:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nb3xSeie889vi5dtxHuHAsn4Vn6L3IVncsI2Y6Lx56g=; b=pc/f/hXsAH1pPlvIHbUnatwUOgKC7TrbwD0E5kJkD6VnNjMdip/URdwwDRoW2XoyBH ic1t/NcgZJfEl7Rn5RlrZvWu3ivZYuMLK7YTO3THqOReA2hNV/4hKTp+kDibE2CDajBv 0ZWKdzGjZ7wTPjO2TiTt/Nmv+9GndisEhT4/qR+gE5gjb0145idQmMM+TRt8ApERzmg+ 2BgCfxM/8PAgKNZ1echww8PK88ctJcpDcoONBt+DGiUuhgsGkJI1YYMzUS92zQi4v5d2 0AeNG9FPJywnEcoo3tKc8mY4ZgRGNfin6+Lp1OGM4kqZS67knxmbzl3+P6JhKiMFk3lQ XSug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nb3xSeie889vi5dtxHuHAsn4Vn6L3IVncsI2Y6Lx56g=; b=gHpIAeDCaDIcO+8rVi0GxgMnQTdwsntmxibGXvWZmigqm/c8iENQC52a/KnUJ5KjO3 Z6ZnkhYFmteGgAm9M3WvQLs6AsG6bjqmX9rlyUYs6D/PbarO+TJ06m9U0z4dp6GrncMb AQViDbwJ/x+xhmj2TpxHXxXkgPnzRAkH8+tIi1+yfZI6m+R0/ECeFUvzWrrqCPKDRKR9 Md7qwJA40JLdHry5fs8YdT3hrgr3AenawfnaHgXTI4Gsy1vqlazRsCFoHosQkZiiaSAX xskXrGYrZ2wZEPJydb99wwzJNDkJLSO/oRqPCKDVvnYBGsrsRjjl3vDJ5iSz7CeZM4Oo MG9w== X-Gm-Message-State: AOAM533Z7V9fMYytu3U+JLUV6WEha0igsCqtSi3BghXFqgBSKZjpmzQy rMmwbKChkl/IjeQGcgFcf6c= X-Google-Smtp-Source: ABdhPJwLLwl0NLr2DqbcAy45dMyGWuVA6Q9UAw7+6hSkEGEEd4aOVSdXc1deJ6WvMMWhUFXEYWz7SQ== X-Received: by 2002:a05:6402:5216:: with SMTP id s22mr24541386edd.359.1643704993669; Tue, 01 Feb 2022 00:43:13 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:13 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/9] staging: r8188eu: BasicRateSet is set but never used Date: Tue, 1 Feb 2022 09:42:54 +0100 Message-Id: <20220201084259.7497-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" The varaible BasicRateSet in struct hal_data_8188e is set but never used. Remove it. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 1 - drivers/staging/r8188eu/include/rtl8188e_hal.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 2252e8a1d55b..e6c253122e9c 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1078,7 +1078,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) /* CCK 5.5M & 11M ACK should be enabled for better performance */ =20 BrateCfg =3D (BrateCfg | 0xd) & 0x15d; - haldata->BasicRateSet =3D BrateCfg; =20 BrateCfg |=3D 0x01; /* default enable 1M ACK rate */ /* Set RRSR rate table. */ diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 88246ef65f8a..7a72b564400d 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -155,8 +155,6 @@ struct hal_data_8188e { u8 CurrentChannel; u8 nCur40MhzPrimeSC;/* Control channel sub-carrier */ =20 - u16 BasicRateSet; - u8 EEPROMRegulatory; u8 EEPROMThermalMeter; =20 --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 10B22C433F5 for ; Tue, 1 Feb 2022 08:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234998AbiBAInc (ORCPT ); Tue, 1 Feb 2022 03:43:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235611AbiBAInQ (ORCPT ); Tue, 1 Feb 2022 03:43:16 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B79F8C061714 for ; Tue, 1 Feb 2022 00:43:15 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id k25so51425010ejp.5 for ; Tue, 01 Feb 2022 00:43:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OcUGeKeL0EKOInXkDi+QcgFMbDvuAB8kSfpOxKij6ak=; b=PR7yHOYioAX2deO8cix58412+wwLYYrBAbbOC2m9XN1KykCipNLjrMwXjL8nvG6IRb LpC77SDbXZCv3G/CcC/Ofkynkm4Ef0omIscGoEWUsZVhocfvNv8YolFzsWxCQA12qwEN M+R2eaA4FlPMK/KSp8lk6XMZ1fU2IybweshCjuuovVHRCtBIR6tpVvy2JnXGM0qSIdxS KLug+UsctjnbtAhvmEVsPV1dH6mOaB96JaHf66ZsuR93wgPJwjrJTuzjVJXly5PZC9XT +R02ZXoJ8TVd1VVVmu7lb6LYbNv7Y8fuqk7LXzmM4c6gfXJsWQsydt48T7kEDRy0Jq8H NNYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OcUGeKeL0EKOInXkDi+QcgFMbDvuAB8kSfpOxKij6ak=; b=Xs71xlQq/kDemieeV9JdsB2XOOlfXRk6nSlEgJKV88DVMnGxlnGHdxp2MOxI3+VfD0 LId9QjjkX4ByXosXpxFk9P4WCwSv2bO+0/oPKsTYCxWwuCneNg+UKdjrNg/XqdImZDbx ue24lT8jKf5alNvED25bwz6gOHNREtGl6tSVRQEmSRhgXgtgIp8M/Xf225X1i+hvHogv gmj8BQRjnS0A9q0tdyCBPEm9GcLFAWapEUMBjQVcxona1ifMOZPUgBm4vBxh42CyXRUZ 77uUecn9gIBlIJj+mvSxZQyD/jSMbVOckyfPjBuPhXvKxk4aHdNUT0l0DrfosY9ApIxu B20A== X-Gm-Message-State: AOAM5300A0abH1XLGNY+Q0P2PhTy5T4mjAo7snuY9DAkOW5qfHrI36j2 8iPTdz2tr30DRuFci5HaqqE= X-Google-Smtp-Source: ABdhPJzUgp2XxgqLgCIJm0f9UXHF21ZR6+g2nDatAa8NidWaOKFPmVjYOGPhPE1uTppAue1yGH/WXA== X-Received: by 2002:a17:907:7289:: with SMTP id dt9mr21039217ejc.62.1643704994382; Tue, 01 Feb 2022 00:43:14 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:14 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 5/9] staging: r8188eu: remove UsbTxAggDescNum from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:55 +0100 Message-Id: <20220201084259.7497-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" UsbTxAggDescNum in struct hal_data_8188e is set to 0x6 and never changed. Define this constant and remove UsbTxAggDescNum from the hal_data_8188e structure. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 +-- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - drivers/staging/r8188eu/include/rtl8188e_xmit.h | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging= /r8188eu/hal/rtl8188eu_xmit.c index 293541db597d..94dafc7c1ad0 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -518,7 +518,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt,= struct xmit_priv *pxmitp =20 if (pbuf < bulkptr) { desc_cnt++; - if (desc_cnt =3D=3D haldata->UsbTxAggDescNum) + if (desc_cnt =3D=3D USB_TXAGG_DESC_NUM) break; } else { desc_cnt =3D 0; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index e6c253122e9c..f33586a740af 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -54,7 +54,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt) haldata->UsbBulkOutSize =3D USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */ =20 haldata->UsbTxAggMode =3D 1; - haldata->UsbTxAggDescNum =3D 0x6; /* only 4 bits */ =20 haldata->UsbRxAggMode =3D USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */ haldata->UsbRxAggBlockCount =3D 8; /* unit : 512b */ @@ -416,7 +415,7 @@ static void usb_AggSettingTxUpdate(struct adapter *Adap= ter) if (haldata->UsbTxAggMode) { value32 =3D rtw_read32(Adapter, REG_TDECTRL); value32 =3D value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT); - value32 |=3D ((haldata->UsbTxAggDescNum & BLK_DESC_NUM_MASK) << BLK_DESC= _NUM_SHIFT); + value32 |=3D ((USB_TXAGG_DESC_NUM & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_S= HIFT); =20 rtw_write32(Adapter, REG_TDECTRL, value32); } diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 7a72b564400d..9f4d42c1d24e 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -214,7 +214,6 @@ struct hal_data_8188e { u32 UsbBulkOutSize; =20 u8 UsbTxAggMode; - u8 UsbTxAggDescNum; =20 enum usb_rx_agg_mode UsbRxAggMode; u8 UsbRxAggBlockCount; /* USB Block count. Block size is diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/stag= ing/r8188eu/include/rtl8188e_xmit.h index f1f2ccfc765e..85eb0aad80d6 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h +++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h @@ -93,6 +93,8 @@ enum TXDESC_SC { #define SGI BIT(6) #define USB_TXAGG_NUM_SHT 24 =20 +#define USB_TXAGG_DESC_NUM 0x6 + #define txdesc_set_ccx_sw_88e(txdesc, value) \ do { \ ((struct txdesc_88e *)(txdesc))->sw1 =3D (((value)>>8) & 0x0f); \ --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 42F4FC433EF for ; Tue, 1 Feb 2022 08:43:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235683AbiBAIng (ORCPT ); Tue, 1 Feb 2022 03:43:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235624AbiBAInQ (ORCPT ); Tue, 1 Feb 2022 03:43:16 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ED9FC061714 for ; Tue, 1 Feb 2022 00:43:16 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id me13so51898988ejb.12 for ; Tue, 01 Feb 2022 00:43:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YcG31YplHrXluk87Wi1M0SWtR6vNAvMNXanCHIBbWJY=; b=QILaIYS0X8sPFHXxt6/0hYjYKZBrxCYFXwo+qDqOidTBHrKO1a06VLbEwwHAFUZLOR Z8n4OxaTfInsu9e0bEnkn8flWOU3Pxl+ZBZ+1tPIcy2u05glF1QCh4u95Z4y2yX4uqDz 8eaxb5V95PxzJ8gCdfXT82pnaCpvu2/jec6OXWkcsSGOWdNiFVb/jt+ZeXIDzYFD1S1e Fo9Ogs72lhvFN4PvHfZAhU6PUrq4FO1PIy7/ClLWOQ5py5LvknNPGIitpMGkGksnPjSM HhP6xKJDB+crGCIXy+k037PR7GapeI1PEaNXaWRFi1m2Ne3xV+mU4tUnV7pbDvQ3SZvd YS2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YcG31YplHrXluk87Wi1M0SWtR6vNAvMNXanCHIBbWJY=; b=70rbBu49rllOfkvW1rYmtNz1ngtxF5ae3/NmOa+gCC7kVVk2v7KaaCWeVeToE+oSjX +e3SdEEJ59ShwSyutjVKobG+UeKaXPJjJFmeoZpU5uf/OgDEon0Ts7fC+85rUd/nYAAU 7koWr7+GvBvZovj1mu/XEr/iP/EAVjd1MxIWerBROHaW5jn9q4YzoGVCTB+0bS1AEcPJ 787OTLOJL5WXeBVVnp4J/6h+oL0aP9C1wx7nYaLZq2w6gu2M5HLqklYzBSTahp9B3QtI ci4JuypzXm5I/oxA2GUu0LZPpwS/c6bdYbWkSJnagWPGq04iwnUYwbgwA3ocWflCOgfI 8ZxQ== X-Gm-Message-State: AOAM531nOxjCGdRcXKMEBb7Wh3+Ia1xLYDvNR9wLlZjKqpUf8sPelF6Z h1pQxakEXOjpl80T7aS52Mo= X-Google-Smtp-Source: ABdhPJyKnpEPDGGp8l+xJimzEO3EJX7CRZY5+s0KYc0f1F4FfOp9lqsDVnU4qd293aAHJ73vYHPnGw== X-Received: by 2002:a17:907:3e27:: with SMTP id hp39mr20715393ejc.761.1643704995080; Tue, 01 Feb 2022 00:43:15 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:14 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 6/9] staging: r8188eu: remove UsbTxAggMode from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:56 +0100 Message-Id: <20220201084259.7497-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" UsbTxAggMode in struct hal_data_r8188e is only used in a single if statement. Remove UsbTxAggMode from the hal_data_8188e structure and adjust the if statement. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 17 ++++++----------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 2 -- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index f33586a740af..1c40d5065f51 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -53,8 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt) else haldata->UsbBulkOutSize =3D USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */ =20 - haldata->UsbTxAggMode =3D 1; - haldata->UsbRxAggMode =3D USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */ haldata->UsbRxAggBlockCount =3D 8; /* unit : 512b */ haldata->UsbRxAggBlockTimeout =3D 0x6; @@ -406,20 +404,17 @@ static void _InitRetryFunction(struct adapter *Adapte= r) *------------------------------------------------------------------------= ---*/ static void usb_AggSettingTxUpdate(struct adapter *Adapter) { - struct hal_data_8188e *haldata =3D &Adapter->haldata; u32 value32; =20 if (Adapter->registrypriv.wifi_spec) - haldata->UsbTxAggMode =3D false; + return; =20 - if (haldata->UsbTxAggMode) { - value32 =3D rtw_read32(Adapter, REG_TDECTRL); - value32 =3D value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT); - value32 |=3D ((USB_TXAGG_DESC_NUM & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_S= HIFT); + value32 =3D rtw_read32(Adapter, REG_TDECTRL); + value32 =3D value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT); + value32 |=3D ((USB_TXAGG_DESC_NUM & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_SH= IFT); =20 - rtw_write32(Adapter, REG_TDECTRL, value32); - } -} /* usb_AggSettingTxUpdate */ + rtw_write32(Adapter, REG_TDECTRL, value32); +} =20 /*------------------------------------------------------------------------= ----- * Function: usb_AggSettingRxUpdate() diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 9f4d42c1d24e..5dce718c0865 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -213,8 +213,6 @@ struct hal_data_8188e { =20 u32 UsbBulkOutSize; =20 - u8 UsbTxAggMode; - enum usb_rx_agg_mode UsbRxAggMode; u8 UsbRxAggBlockCount; /* USB Block count. Block size is * 512-byte in high speed and 64-byte --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 CFCF9C433F5 for ; Tue, 1 Feb 2022 08:43:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235806AbiBAInh (ORCPT ); Tue, 1 Feb 2022 03:43:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235636AbiBAInR (ORCPT ); Tue, 1 Feb 2022 03:43:17 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EF03C061714 for ; Tue, 1 Feb 2022 00:43:17 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id n10so32532311edv.2 for ; Tue, 01 Feb 2022 00:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+khK+X1Tp7N7uLEEkyh1T4TAhKh+Nifr7JoDeeEAPdc=; b=jBtKgJ3XTY5GVjqULjidEebnr4VyPiFDrmgXJ0pQtyd/6nQrBXgIVs9lYl0Y0HkHHA OckP0DnMaoZKU/lyAam2Bd7LDNdmWnddkpYV0FazV6mGNZp6l4yYLGLgWnk+Lpj188lc SjGjZOHb+QHGYsI07RuGSpgR1ShZJxIRmgx5+nre/tvbeoYfkKNZAaa511ihTp9ZkNV+ C1wuUSNAM+FxB7/GoQWZ0S9MIsK334LrnFGEhb+aQ78MX9sVlLa4E/AdupPDelV557wc Zl7RKmQUAz1TTSLOWpHVsPdzbZQixb1dc3qxgdQGHKuKTM25qecLClkYI6TJ1LBrxwpf UUlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+khK+X1Tp7N7uLEEkyh1T4TAhKh+Nifr7JoDeeEAPdc=; b=PlVb2acPm262/31iKViPrdhYbX3BUb6ocpXH9FYInOSYZWZNTNcgQtyKX2rDo6Psz/ u/NTUrLs1SZl24msos+JIHAkPAH464UmuZzFZcYtHf0Fku9W/PARSxlfgZq2FJ20yDWM 2/IXdRe4slRz3dFdAJ3csKWy1y6Mdmog3fDWgqGhkv8cZWJ2dErZOOrulue8YRUX667K aGopxgkvQoje3GUpvsGy4o8hTNiIAKbKeaf9x/S6i98iRqWuny6U4r5hA8kkmKutHxxe 1isbJp3q3JMU+HF5OIFbKLGXCSPDVm2ANg1bEbH3sFbUCltXTIPK2wddR2R7jsmdvRyQ yumA== X-Gm-Message-State: AOAM530Ls9GHyNBVUZb7QWOUcMK3h98MaRI6STtGO3dMw0Ofs2sHijCO XBU34A6xVixPaNE9ZvpvboI= X-Google-Smtp-Source: ABdhPJwROa4jmK1HSSwcC5LuSdZCeZnn57xUSJwfO/ZUIrHB2hCGkPCKpNnxWZdLl/OSyGXyvr1Q8w== X-Received: by 2002:aa7:c4cd:: with SMTP id p13mr2738450edr.428.1643704995838; Tue, 01 Feb 2022 00:43:15 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:15 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 7/9] staging: r8188eu: remove UsbRxAggMode from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:57 +0100 Message-Id: <20220201084259.7497-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" UsbRxAggMode in struct hal_data_8188e is set to USB_RX_AGG_DMA and never changed. Remove UsbRxAggMode from the hal_data_8188e structure and remove related dead code. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 46 ++----------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 14 +----- .../staging/r8188eu/include/rtl8188e_hal.h | 8 ---- 3 files changed, 7 insertions(+), 61 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 1c40d5065f51..24c11c666534 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -53,7 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt) else haldata->UsbBulkOutSize =3D USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */ =20 - haldata->UsbRxAggMode =3D USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */ haldata->UsbRxAggBlockCount =3D 8; /* unit : 512b */ haldata->UsbRxAggBlockTimeout =3D 0x6; haldata->UsbRxAggPageCount =3D 48; /* uint :128 b 0x0A; 10 =3D MAX_RX_DMA= _BUFFER_SIZE/2/haldata->UsbBulkOutSize */ @@ -443,50 +442,15 @@ usb_AggSettingRxUpdate( valueDMA =3D rtw_read8(Adapter, REG_TRXDMA_CTRL); valueUSB =3D rtw_read8(Adapter, REG_USB_SPECIAL_OPTION); =20 - switch (haldata->UsbRxAggMode) { - case USB_RX_AGG_DMA: - valueDMA |=3D RXDMA_AGG_EN; - valueUSB &=3D ~USB_AGG_EN; - break; - case USB_RX_AGG_USB: - valueDMA &=3D ~RXDMA_AGG_EN; - valueUSB |=3D USB_AGG_EN; - break; - case USB_RX_AGG_MIX: - valueDMA |=3D RXDMA_AGG_EN; - valueUSB |=3D USB_AGG_EN; - break; - case USB_RX_AGG_DISABLE: - default: - valueDMA &=3D ~RXDMA_AGG_EN; - valueUSB &=3D ~USB_AGG_EN; - break; - } + valueDMA |=3D RXDMA_AGG_EN; + valueUSB &=3D ~USB_AGG_EN; =20 rtw_write8(Adapter, REG_TRXDMA_CTRL, valueDMA); rtw_write8(Adapter, REG_USB_SPECIAL_OPTION, valueUSB); =20 - switch (haldata->UsbRxAggMode) { - case USB_RX_AGG_DMA: - rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, haldata->UsbRxAggPageCount); - rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH + 1, haldata->UsbRxAggPageTimeou= t); - break; - case USB_RX_AGG_USB: - rtw_write8(Adapter, REG_USB_AGG_TH, haldata->UsbRxAggBlockCount); - rtw_write8(Adapter, REG_USB_AGG_TO, haldata->UsbRxAggBlockTimeout); - break; - case USB_RX_AGG_MIX: - rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, haldata->UsbRxAggPageCount); - rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH + 1, (haldata->UsbRxAggPageTimeo= ut & 0x1F));/* 0x280[12:8] */ - rtw_write8(Adapter, REG_USB_AGG_TH, haldata->UsbRxAggBlockCount); - rtw_write8(Adapter, REG_USB_AGG_TO, haldata->UsbRxAggBlockTimeout); - break; - case USB_RX_AGG_DISABLE: - default: - /* TODO: */ - break; - } -} /* usb_AggSettingRxUpdate */ + rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, haldata->UsbRxAggPageCount); + rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH + 1, haldata->UsbRxAggPageTimeout= ); +} =20 static void InitUsbAggregationSetting(struct adapter *Adapter) { diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/= r8188eu/hal/usb_ops_linux.c index 4a0ab4053e90..b7b51af7f2c3 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -295,18 +295,8 @@ static int recvbuf2recvframe(struct adapter *adapt, st= ruct sk_buff *pskb) =20 recvframe_put(precvframe, skb_len); =20 - switch (haldata->UsbRxAggMode) { - case USB_RX_AGG_DMA: - case USB_RX_AGG_MIX: - pkt_offset =3D (u16)_RND128(pkt_offset); - break; - case USB_RX_AGG_USB: - pkt_offset =3D (u16)_RND4(pkt_offset); - break; - case USB_RX_AGG_DISABLE: - default: - break; - } + pkt_offset =3D (u16)_RND128(pkt_offset); + if (pattrib->pkt_rpt_type =3D=3D NORMAL_RX) { /* Normal rx packet */ if (pattrib->physt) update_recvframe_phyinfo_88e(precvframe, (struct phy_stat *)pphy_statu= s); diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 5dce718c0865..98d909b6d217 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -72,13 +72,6 @@ struct rt_firmware_hdr { #define DRIVER_EARLY_INT_TIME 0x05 #define BCN_DMA_ATIME_INT_TIME 0x02 =20 -enum usb_rx_agg_mode { - USB_RX_AGG_DISABLE, - USB_RX_AGG_DMA, - USB_RX_AGG_USB, - USB_RX_AGG_MIX -}; - #define MAX_RX_DMA_BUFFER_SIZE_88E \ 0x2400 /* 9k for 88E nornal chip , MaxRxBuff=3D10k-max(TxReportSize(= 64*8), * WOLPattern(16*24)) */ @@ -213,7 +206,6 @@ struct hal_data_8188e { =20 u32 UsbBulkOutSize; =20 - enum usb_rx_agg_mode UsbRxAggMode; u8 UsbRxAggBlockCount; /* USB Block count. Block size is * 512-byte in high speed and 64-byte * in full speed */ --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 2B0D0C433EF for ; Tue, 1 Feb 2022 08:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234299AbiBAInm (ORCPT ); Tue, 1 Feb 2022 03:43:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235641AbiBAInS (ORCPT ); Tue, 1 Feb 2022 03:43:18 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E03CCC06173B for ; Tue, 1 Feb 2022 00:43:17 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id jx6so52176838ejb.0 for ; Tue, 01 Feb 2022 00:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B8zl36G7JlUGXj8aWslwhr97KzVAYYmIGHBWCkBFK+8=; b=E941/X84IaEHoXKvH/LHgPKecFrjJ7ESo8JUDdvrWGzaWn6oAu+3K/5p0GvE0gGiaA 3Me4GAYQPEaGpeBxgxsZg9IM7+bwIpoE5Gb/kKAQaaUhdCaKiE78DnsMUStMhJtdBJdW UGCyxg0shKxnAGVdViJmIRBcoW5GbD5adLOfMKiIar81a5CMLLD03BxH+rdynJOCZK55 fXaM804mHAaKj9/MG6I9zcEkk4cO8Oh4B2CjVRrjLA3wPt4In9qkMP0PbME8KJlgsHCr 4FBPaK06owjaNmPLE78Jk4URskCBMTW3gprCvIOupwuTCVgHURXLM7KYL1Qw2JJDmozX 2Ffg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B8zl36G7JlUGXj8aWslwhr97KzVAYYmIGHBWCkBFK+8=; b=xjrBe3NTpfw729Q91mc18dUvkuBFKTEe38mouXcj9nkBalhtGEmNDL/UhPyjxcuEsE G0fx4Vawnd1t/4Fdk9v9/vIAQ4KeomkDvoidBT1WPZwGSDnDkHsZhZsk9eWf5VwRMI5J mHrF/flWudaZetQ7ZOQoh4lwrLQEMyLeAKIcCvrwauqB0EenU8OpQiXzB3DuuqobCp4f IdwI8hbMmWf4nlCKIqdgVN0blAHvTVIjkE+DhjWertPs+7jf0S8xD72m2wu4sdO0pPaa /xpAVQmaOCEKBWHijvg6YKDLKTvXOblie2TqKX4BdgF2V+KCzYb7LiyiUNY2GsQ9zZQf /Ktg== X-Gm-Message-State: AOAM533q9zUuMMD6x9FqrKZltQydpTIeX334997+GUjMOXswKpy4lIct oeo/P42CYJHwdrzilBBVT+c= X-Google-Smtp-Source: ABdhPJyhx1/GltpDK0pKlqouPy8wnEFLIJbK8JjoRBLmvQrIZKqPEfGQAM/d4LzsOKRg7mwJff4xfg== X-Received: by 2002:a17:907:3f0d:: with SMTP id hq13mr20219436ejc.358.1643704996548; Tue, 01 Feb 2022 00:43:16 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:16 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 8/9] staging: r8188eu: remove UsbRxAggBlock* from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:58 +0100 Message-Id: <20220201084259.7497-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" UsbRxAggBlockCount and UsbRxAggBlockTimeout in struct hal_data_8188e are set but not used. Remove them. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 2 -- drivers/staging/r8188eu/include/rtl8188e_hal.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 24c11c666534..1d0d58204c68 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -53,8 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt) else haldata->UsbBulkOutSize =3D USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */ =20 - haldata->UsbRxAggBlockCount =3D 8; /* unit : 512b */ - haldata->UsbRxAggBlockTimeout =3D 0x6; haldata->UsbRxAggPageCount =3D 48; /* uint :128 b 0x0A; 10 =3D MAX_RX_DMA= _BUFFER_SIZE/2/haldata->UsbBulkOutSize */ haldata->UsbRxAggPageTimeout =3D 0x4; /* 6, absolute time =3D 34ms/(2^6) = */ =20 diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 98d909b6d217..94678dad37ce 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -206,10 +206,6 @@ struct hal_data_8188e { =20 u32 UsbBulkOutSize; =20 - u8 UsbRxAggBlockCount; /* USB Block count. Block size is - * 512-byte in high speed and 64-byte - * in full speed */ - u8 UsbRxAggBlockTimeout; u8 UsbRxAggPageCount; /* 8192C DMA page count */ u8 UsbRxAggPageTimeout; }; --=20 2.34.1 From nobody Mon Jun 29 23:23:12 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 A31A2C433F5 for ; Tue, 1 Feb 2022 08:43:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235665AbiBAInk (ORCPT ); Tue, 1 Feb 2022 03:43:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235647AbiBAInT (ORCPT ); Tue, 1 Feb 2022 03:43:19 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9738EC061401 for ; Tue, 1 Feb 2022 00:43:18 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id u18so32326160edt.6 for ; Tue, 01 Feb 2022 00:43:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gDq463DNVx/yVKZ/LadmFf4Y3fkl66W4uW7inBK8Rkc=; b=E+2wTffkrVC/iGBhzKfuD7TRLzeyBo7Xdig565Z4e3Zc58OqmVaQN7Z8Nb4re9HpYu 2hg6kOFds4juLeqHaMO9uxNidkj80QvtgfskqsA8bqEdWO2cWLHViGidVL+VATjEWRr6 oLr9zPrZ10cz9kPGHKceXqdg/qNSdlKs+XdwBJljPLF3IvsbiAULYCkjDal5iEk7Cbgm mqoGSufeZK4MgpN+5OAiUgQ6z5xtIqaidNcpuV9n/+DPUiTUmH2O5wCFkiiZuXgYciJz QOnpAMcOLYL9Az2O+Q8qzZlGfoljAwBLbCTwk7Adi2/+xl//GgFD7Udu13+S3T4LdlNQ +jhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gDq463DNVx/yVKZ/LadmFf4Y3fkl66W4uW7inBK8Rkc=; b=mIuDG8fZMwI2YovrQobw7Pqnu6QHGju5QjICnLdLC53ZcicwqN3+dxc2UfsOqExPBf RGsMF7cTJfZ4bvhAw5eV30FWwpJL+vk1l1P3nhTCR/xk4hVsU3Ci+HLOQNG5oJKXbvVH a6is02+lsGa2Wj4KXUQW9/GbhPGd+fciWa8+Fsg45lN3t1YZi/aUF22yywhEESXa5z5p n2cInzlvKA1TUgzohAgCD2isdt2SZmQ7TFqz/dQYPECnkmHcpZ5vt2ELi4NRofc14ske pYfCzaj2q3rTuJd/Qgxpv8El40Ns6WmpaPCsK1MJ91hz7L6y49is/b3puDNEpIGJ/ul0 GEXA== X-Gm-Message-State: AOAM531Fp0MrPUXjczQ/5fRT6+3y8TlVp8IyuNSGTTejJklBZhrr7ha1 bvEQ2zAFtxBOP7SopbK5Ciw= X-Google-Smtp-Source: ABdhPJyqQzkb4f6lJvMfhPBHYgRQmt22p5Q8jsB++VkSFjjhRJkQ2YANIp5uaatl/xXwABi0guHb1A== X-Received: by 2002:a50:9fc6:: with SMTP id c64mr24255079edf.5.1643704997273; Tue, 01 Feb 2022 00:43:17 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:16 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 9/9] staging: r8188eu: remove UsbRxAggPage* from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:59 +0100 Message-Id: <20220201084259.7497-10-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> 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" UsbRxAggPageCount and UsbRxAggPageTimeout in struct hal_data_8188e are set and never changed. Define these constants and remove the variables from the hal_data_8188e structure. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 10 +++------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 6 +++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 1d0d58204c68..f21b910bd88d 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -53,9 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt) else haldata->UsbBulkOutSize =3D USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */ =20 - haldata->UsbRxAggPageCount =3D 48; /* uint :128 b 0x0A; 10 =3D MAX_RX_DMA= _BUFFER_SIZE/2/haldata->UsbBulkOutSize */ - haldata->UsbRxAggPageTimeout =3D 0x4; /* 6, absolute time =3D 34ms/(2^6) = */ - HalUsbSetQueuePipeMapping8188EUsb(adapt, pdvobjpriv->RtNumOutPipes); } =20 @@ -433,7 +430,6 @@ usb_AggSettingRxUpdate( struct adapter *Adapter ) { - struct hal_data_8188e *haldata =3D &Adapter->haldata; u8 valueDMA; u8 valueUSB; =20 @@ -446,8 +442,8 @@ usb_AggSettingRxUpdate( rtw_write8(Adapter, REG_TRXDMA_CTRL, valueDMA); rtw_write8(Adapter, REG_USB_SPECIAL_OPTION, valueUSB); =20 - rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, haldata->UsbRxAggPageCount); - rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH + 1, haldata->UsbRxAggPageTimeout= ); + rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, USB_RXAGG_PAGE_COUNT); + rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH + 1, USB_RXAGG_PAGE_TIMEOUT); } =20 static void InitUsbAggregationSetting(struct adapter *Adapter) @@ -1314,7 +1310,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) { u8 threshold =3D *((u8 *)val); if (threshold =3D=3D 0) - threshold =3D haldata->UsbRxAggPageCount; + threshold =3D USB_RXAGG_PAGE_COUNT; rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, threshold); } break; diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index 94678dad37ce..e3c028ff20c7 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -141,6 +141,9 @@ struct txpowerinfo24g { =20 #define EFUSE_PROTECT_BYTES_BANK 16 =20 +#define USB_RXAGG_PAGE_COUNT 48 +#define USB_RXAGG_PAGE_TIMEOUT 0x4 + struct hal_data_8188e { struct HAL_VERSION VersionID; /* current WIFI_PHY values */ @@ -205,9 +208,6 @@ struct hal_data_8188e { u8 bMacPwrCtrlOn; =20 u32 UsbBulkOutSize; - - u8 UsbRxAggPageCount; /* 8192C DMA page count */ - u8 UsbRxAggPageTimeout; }; =20 s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy); --=20 2.34.1