From nobody Thu Jan 1 12:24:14 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 536E2CDB474 for ; Mon, 23 Oct 2023 06:39:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233536AbjJWGjm (ORCPT ); Mon, 23 Oct 2023 02:39:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229650AbjJWGjk (ORCPT ); Mon, 23 Oct 2023 02:39:40 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03ED5D5B for ; Sun, 22 Oct 2023 23:39:37 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9c40c3814a8so88350466b.0 for ; Sun, 22 Oct 2023 23:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043175; x=1698647975; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=CbuDFZ6Q4bsAALBcS9+CuBZ65o4x+vujhw43QWbD5pU=; b=Mk4wmw0dpc51nTxBmfZQ1GUYF7UmcfppZMAAwGEg1D4WmaqzKEX1E8u4PTp9VBWhoP yp2nAsjSZ1wZYcAkYLGk1GZpgj2VYrlW42gadSy60+OOGlN9L0lp71ByN+a/MSZurphl 5IXFETWfYMG0zxyxWd4BfmcdrcWqEVVOvESKJlNo7k1DJlmMyYMs5Xu885SB/lTMr5fC VwsoVMaRqThUHW6CXQmPwaGaj3xJwkFTA6pIJl6AeWUJnOdoaBQDXiScbawtgYQ4FB+T 4eigqsZCyG8U8T9KD87od1HSlmsdo45SeLeb/AZW1w/CBLvTFDMR3KJjbKB26JUvN1ht pPyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043175; x=1698647975; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CbuDFZ6Q4bsAALBcS9+CuBZ65o4x+vujhw43QWbD5pU=; b=Vn15Cy6upgirDgVlix+P9LcLMHnVvd7Z2shwSQw9cPyBU0AH+rsAxGOPpf3+O5/iNi ZqU4qp4Co6p/M4eoyYhOyy4/+TgUBSGSX6QIyqcuauR3qPvgLJGAx9Ylduejrz8c3kKq CEL/jc6Szuz1vPLtZjr8r1int4y6u5oc7unBnsWit0IC35YfnY7bCs0w+8nTDOIhUDQ4 wwumCm7l0l+0EpodEDc1OOc8JUaUxo81wngEThEf6n3F3mcwB3v80mrGvZ3SE/atsSG4 j9/SzJwYPASCkNQ3C8px8kjBDEZV67fERZEaEVvUUFLqeSG87ChFJcrRqLfjuDdW8boP DHqg== X-Gm-Message-State: AOJu0Yyi0jWpvttIsRZ+cbpCFXPaRunDvZ5HjlHVmUXwOFMmdgOrIOT8 9Uzpc0joTveiKa4CYNEFc3TcPQCElKE= X-Google-Smtp-Source: AGHT+IGQJysNoQEMkO2u3/ZXpnv0wpqq45SJiRHGHiC+CFyg6AAisShWHQu1CgoJ/50kDF84t19phg== X-Received: by 2002:a17:906:74d9:b0:9c3:9577:5638 with SMTP id z25-20020a17090674d900b009c395775638mr5137379ejl.0.1698043175023; Sun, 22 Oct 2023 23:39:35 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id bm11-20020a170906c04b00b009a193a5acffsm6061090ejb.121.2023.10.22.23.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:39:34 -0700 (PDT) Date: Mon, 23 Oct 2023 08:39:33 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] staging: rtl8192e: Replace BIT0 to BIT9 with BIT(0) to BIT(9) Message-ID: <07e7de26d364d0781e41892d5738e1b6b93faf53.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace custom macros BIT0 to BIT9 with standard kernel macros BIT(0) to BIT(9) to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 70 +++++++++---------- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 10 --- drivers/staging/rtl8192e/rtllib.h | 4 +- 6 files changed, 41 insertions(+), 51 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/stagin= g/rtl8192e/rtl8192e/r8192E_hw.h index 09f8c76b7e65..80f44ffe00e6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -43,7 +43,7 @@ enum _RTL8192PCI_HW { PMR =3D 0x00c, EPROM_CMD =3D 0x00e, =20 -#define EPROM_CMD_9356SEL BIT4 +#define EPROM_CMD_9356SEL BIT(4) #define EPROM_CMD_OPERATING_MODE_SHIFT 6 #define EPROM_CMD_NORMAL 0 #define EPROM_CMD_PROGRAM 2 @@ -67,10 +67,10 @@ enum _RTL8192PCI_HW { #define RCR_AMF BIT20 #define RCR_ADF BIT18 #define RCR_AICV BIT12 -#define RCR_AB BIT3 -#define RCR_AM BIT2 -#define RCR_APM BIT1 -#define RCR_AAP BIT0 +#define RCR_AB BIT(3) +#define RCR_AM BIT(2) +#define RCR_APM BIT(1) +#define RCR_AAP BIT(0) #define RCR_MXDMA_OFFSET 8 #define RCR_FIFO_OFFSET 13 SLOT_TIME =3D 0x049, @@ -95,11 +95,11 @@ enum _RTL8192PCI_HW { #define TOTAL_CAM_ENTRY 32 WCAMI =3D 0x0A4, SECR =3D 0x0B0, -#define SCR_TxUseDK BIT0 -#define SCR_RxUseDK BIT1 -#define SCR_TxEncEnable BIT2 -#define SCR_RxDecEnable BIT3 -#define SCR_NoSKMC BIT5 +#define SCR_TxUseDK BIT(0) +#define SCR_RxUseDK BIT(1) +#define SCR_TxEncEnable BIT(2) +#define SCR_RxDecEnable BIT(3) +#define SCR_NoSKMC BIT(5) SWREGULATOR =3D 0x0BD, INTA_MASK =3D 0x0f4, #define IMR_TBDOK BIT27 @@ -110,19 +110,19 @@ enum _RTL8192PCI_HW { #define IMR_RXFOVW BIT12 #define IMR_RDU BIT11 #define IMR_RXCMDOK BIT10 -#define IMR_BDOK BIT9 -#define IMR_HIGHDOK BIT8 -#define IMR_COMDOK BIT7 -#define IMR_MGNTDOK BIT6 -#define IMR_HCCADOK BIT5 -#define IMR_BKDOK BIT4 -#define IMR_BEDOK BIT3 -#define IMR_VIDOK BIT2 -#define IMR_VODOK BIT1 -#define IMR_ROK BIT0 +#define IMR_BDOK BIT(9) +#define IMR_HIGHDOK BIT(8) +#define IMR_COMDOK BIT(7) +#define IMR_MGNTDOK BIT(6) +#define IMR_HCCADOK BIT(5) +#define IMR_BKDOK BIT(4) +#define IMR_BEDOK BIT(3) +#define IMR_VIDOK BIT(2) +#define IMR_VODOK BIT(1) +#define IMR_ROK BIT(0) ISR =3D 0x0f8, TP_POLL =3D 0x0fd, -#define TP_POLL_CQ BIT5 +#define TP_POLL_CQ BIT(5) PSR =3D 0x0ff, CPU_GEN =3D 0x100, #define CPU_CCK_LOOPBACK 0x00030000 @@ -136,9 +136,9 @@ enum _RTL8192PCI_HW { #define CPU_GEN_NO_LOOPBACK_MSK 0xFFF8FFFF #define CPU_GEN_NO_LOOPBACK_SET 0x00080000 ACM_HW_CTRL =3D 0x171, -#define ACM_HW_BEQ_EN BIT1 -#define ACM_HW_VIQ_EN BIT2 -#define ACM_HW_VOQ_EN BIT3 +#define ACM_HW_BEQ_EN BIT(1) +#define ACM_HW_VIQ_EN BIT(2) +#define ACM_HW_VOQ_EN BIT(3) RQPN1 =3D 0x180, RQPN2 =3D 0x184, RQPN3 =3D 0x188, @@ -159,7 +159,7 @@ enum _RTL8192PCI_HW { WFCRC2 =3D 0x2f8, =20 BW_OPMODE =3D 0x300, -#define BW_OPMODE_20MHZ BIT2 +#define BW_OPMODE_20MHZ BIT(2) IC_VERRSION =3D 0x301, MSR =3D 0x303, #define MSR_LINK_MASK (BIT(1) | BIT(0)) @@ -178,16 +178,16 @@ enum _RTL8192PCI_HW { TSFR =3D 0x308, RRSR =3D 0x310, #define RRSR_SHORT_OFFSET 23 -#define RRSR_1M BIT0 -#define RRSR_2M BIT1 -#define RRSR_5_5M BIT2 -#define RRSR_11M BIT3 -#define RRSR_6M BIT4 -#define RRSR_9M BIT5 -#define RRSR_12M BIT6 -#define RRSR_18M BIT7 -#define RRSR_24M BIT8 -#define RRSR_36M BIT9 +#define RRSR_1M BIT(0) +#define RRSR_2M BIT(1) +#define RRSR_5_5M BIT(2) +#define RRSR_11M BIT(3) +#define RRSR_6M BIT(4) +#define RRSR_9M BIT(5) +#define RRSR_12M BIT(6) +#define RRSR_18M BIT(7) +#define RRSR_24M BIT(8) +#define RRSR_36M BIT(9) #define RRSR_48M BIT10 #define RRSR_54M BIT11 #define BRSR_AckShortPmb BIT23 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index a5e16bf99cd6..4d12d7385041 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -965,7 +965,7 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operat= ion) =20 void rtl92e_set_rf_off(struct net_device *dev) { - rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, BIT4, 0x0); + rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, BIT(4), 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x18, 0x0); rtl92e_set_bb_reg(dev, rOFDM0_TRxPathEnable, 0xf, 0x0); @@ -1016,7 +1016,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, 0x4, 0x1); priv->hw_rf_off_action =3D 0; rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, - BIT4, 0x1); + BIT(4), 0x1); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 97de404840df..e88963a4b1f1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1247,7 +1247,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) =20 tmp1byte =3D rtl92e_readb(dev, GPI); =20 - rf_power_state_to_set =3D (tmp1byte & BIT1) ? rf_on : rf_off; + rf_power_state_to_set =3D (tmp1byte & BIT(1)) ? rf_on : rf_off; =20 if (priv->hw_radio_off && (rf_power_state_to_set =3D=3D rf_on)) { netdev_info(dev, "gpiochangeRF - HW Radio ON\n"); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_pci.c index 0bc3e013001e..1aa73561581b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c @@ -21,7 +21,7 @@ static void _rtl92e_parse_pci_configuration(struct pci_de= v *pdev, pcie_capability_read_word(priv->pdev, PCI_EXP_LNKCTL, &link_ctrl_reg); =20 pci_read_config_byte(pdev, 0x98, &tmp); - tmp |=3D BIT4; + tmp |=3D BIT(4); pci_write_config_byte(pdev, 0x98, tmp); =20 tmp =3D 0x17; diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index 37677366c397..519a3160933b 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -7,16 +7,6 @@ #ifndef __INC_QOS_TYPE_H #define __INC_QOS_TYPE_H =20 -#define BIT0 0x00000001 -#define BIT1 0x00000002 -#define BIT2 0x00000004 -#define BIT3 0x00000008 -#define BIT4 0x00000010 -#define BIT5 0x00000020 -#define BIT6 0x00000040 -#define BIT7 0x00000080 -#define BIT8 0x00000100 -#define BIT9 0x00000200 #define BIT10 0x00000400 #define BIT11 0x00000800 #define BIT12 0x00001000 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 9d141aad8cd5..7f0aa0779c78 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -91,7 +91,7 @@ static inline void *netdev_priv_rsl(struct net_device *de= v) #define IE_CISCO_FLAG_POSITION 0x08 #define SUPPORT_CKIP_MIC 0x08 #define SUPPORT_CKIP_PK 0x10 -#define RT_RF_OFF_LEVL_HALT_NIC BIT3 +#define RT_RF_OFF_LEVL_HALT_NIC BIT(3) #define RT_IN_PS_LEVEL(psc, _PS_FLAG) \ ((psc->CurPsLevel & _PS_FLAG) ? true : false) #define RT_CLEAR_PS_LEVEL(psc, _PS_FLAG) \ @@ -341,7 +341,7 @@ enum rt_op_mode { /* QOS control */ #define RTLLIB_QCTL_TID 0x000F =20 -#define FC_QOS_BIT BIT7 +#define FC_QOS_BIT BIT(7) #define IsDataFrame(pdu) (((pdu[0] & 0x0C) =3D=3D 0x08) ? true : false) #define IsLegacyDataFrame(pdu) (IsDataFrame(pdu) && (!(pdu[0]&FC_QOS_BIT))) #define IsQoSDataFrame(pframe) \ --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 5BEE7CDB474 for ; Mon, 23 Oct 2023 06:39:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233551AbjJWGjy (ORCPT ); Mon, 23 Oct 2023 02:39:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233514AbjJWGjt (ORCPT ); Mon, 23 Oct 2023 02:39:49 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A28D7D for ; Sun, 22 Oct 2023 23:39:45 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-9c14313eb1cso78547166b.0 for ; Sun, 22 Oct 2023 23:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043184; x=1698647984; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=qLFo6mN1dQpFM3u9PDdaEolPvTWL8Fd9rcZrlk3kJ7c=; b=Vu5yuvkzY3x7Lwd7P1w0hPGEDF52ZRcSPTmEVqiN7D2GPUebi0QvdCkKwDrVP9x21Z cqMaDu5brThPWlIJkAgpIBIkNoOzCSyLXn1K0rgEfAEAEfk9u6LJwNKezS5sHl1/ZA/Y 70gfE8fySvZZcOmAYER9eF2LnDM7vYOUnHbTjsZrle5XTAPYd79L/P7t1B08jI1U5Rvj VZJQI/8k7mljaq/zHA8hp2/65kDB+l0CchtTv1+HK6eWw1uzoEMW5x9tOP+cmdKIBYEO otGgrpyatqyUr2zZa4WlGsU/6gHIicine/i0qtbaESQJtJnuvsIZrUWOkfsPEGXAuwr3 xkoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043184; x=1698647984; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qLFo6mN1dQpFM3u9PDdaEolPvTWL8Fd9rcZrlk3kJ7c=; b=b67vN0e2JEeUUWtH2K7ELhM1qibw7eiLYN4wE9dR1pgdtjUW055/BQreIfvhQM7tZM DLjEXXOJ+w9EleGbRos5i3jJQj48OELx3zEHDm1xOa0xco6V3GJsFtGA71edYxX0JZoh peWfs+E1lMvOMAwtxZ/EVuWpsmCwazD+kYHu+xgjMcqqHDiGF0Ur8IIL2rwsd8BmuuJu Jfv+Fv6IxbD/P5ErPffHGIlLFE+Vc8CZcGcAsGs5DT/8CgsHiwcLNYdEv6RV45h25Tnt HvRi9GbRK8YWgDf/8ttQ9gN6VW+9Vxe2qODFisGfCyVMzo5c/4EGJR9klzqO/2Z0S9S0 9M+A== X-Gm-Message-State: AOJu0YwJkOx7QCAaumM1hBhz9XwV7PlsgXa6CF3N6h5um1LVRsdjumEw sCf/clisecMaAmkQvtJ8yug= X-Google-Smtp-Source: AGHT+IHCwhcP9Y/oXdcdOq/TKc2HmWfozMB/+qFnQlIuonoREuH8aT1eRtLCr3Y3Hbiymgh3rkVYwA== X-Received: by 2002:a17:906:7394:b0:9b2:bf2d:6b65 with SMTP id f20-20020a170906739400b009b2bf2d6b65mr5838149ejl.4.1698043183605; Sun, 22 Oct 2023 23:39:43 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id ss17-20020a170907039100b0099cb349d570sm6131450ejb.185.2023.10.22.23.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:39:43 -0700 (PDT) Date: Mon, 23 Oct 2023 08:39:41 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] staging: rtl8192e: Replace BIT10 to BIT31 with BIT(10) to BIT(31) Message-ID: <294ff1d0b92a474a9ae0d48a54a9f99f14008053.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace custom macros BIT10 to BIT31 with standard kernel macros BIT(10) to BIT(31) to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 34 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 8 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 20 +++++------ drivers/staging/rtl8192e/rtl819x_Qos.h | 23 ------------- drivers/staging/rtl8192e/rtllib.h | 8 ++--- 5 files changed, 35 insertions(+), 58 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/stagin= g/rtl8192e/rtl8192e/r8192E_hw.h index 80f44ffe00e6..1b444529b59c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -61,12 +61,12 @@ enum _RTL8192PCI_HW { #define CR_TE 0x04 SIFS =3D 0x03E, RCR =3D 0x044, -#define RCR_ONLYERLPKT BIT31 -#define RCR_CBSSID BIT23 -#define RCR_ADD3 BIT21 -#define RCR_AMF BIT20 -#define RCR_ADF BIT18 -#define RCR_AICV BIT12 +#define RCR_ONLYERLPKT BIT(31) +#define RCR_CBSSID BIT(23) +#define RCR_ADD3 BIT(21) +#define RCR_AMF BIT(20) +#define RCR_ADF BIT(18) +#define RCR_AICV BIT(12) #define RCR_AB BIT(3) #define RCR_AM BIT(2) #define RCR_APM BIT(1) @@ -102,14 +102,14 @@ enum _RTL8192PCI_HW { #define SCR_NoSKMC BIT(5) SWREGULATOR =3D 0x0BD, INTA_MASK =3D 0x0f4, -#define IMR_TBDOK BIT27 -#define IMR_TBDER BIT26 -#define IMR_TXFOVW BIT15 -#define IMR_TIMEOUT0 BIT14 -#define IMR_BcnInt BIT13 -#define IMR_RXFOVW BIT12 -#define IMR_RDU BIT11 -#define IMR_RXCMDOK BIT10 +#define IMR_TBDOK BIT(27) +#define IMR_TBDER BIT(26) +#define IMR_TXFOVW BIT(15) +#define IMR_TIMEOUT0 BIT(14) +#define IMR_BcnInt BIT(13) +#define IMR_RXFOVW BIT(12) +#define IMR_RDU BIT(11) +#define IMR_RXCMDOK BIT(10) #define IMR_BDOK BIT(9) #define IMR_HIGHDOK BIT(8) #define IMR_COMDOK BIT(7) @@ -188,9 +188,9 @@ enum _RTL8192PCI_HW { #define RRSR_18M BIT(7) #define RRSR_24M BIT(8) #define RRSR_36M BIT(9) -#define RRSR_48M BIT10 -#define RRSR_54M BIT11 -#define BRSR_AckShortPmb BIT23 +#define RRSR_48M BIT(10) +#define RRSR_54M BIT(11) +#define BRSR_AckShortPmb BIT(23) UFWP =3D 0x318, RATR0 =3D 0x320, #define RATR_1M 0x00000001 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 76ec4ed967c4..69298c7c129a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev) { u32 ulcommand =3D 0; =20 - ulcommand |=3D BIT31 | BIT30; + ulcommand |=3D BIT(31) | BIT(30); rtl92e_writel(dev, RWCAM, ulcommand); } =20 @@ -89,13 +89,13 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo,= u8 KeyIndex, } =20 if (DefaultKey) - usConfig |=3D BIT15 | (KeyType << 2); + usConfig |=3D BIT(15) | (KeyType << 2); else - usConfig |=3D BIT15 | (KeyType << 2) | KeyIndex; + usConfig |=3D BIT(15) | (KeyType << 2) | KeyIndex; =20 for (i =3D 0; i < CAM_CONTENT_COUNT; i++) { TargetCommand =3D i + CAM_CONTENT_COUNT * EntryNo; - TargetCommand |=3D BIT31 | BIT16; + TargetCommand |=3D BIT(31) | BIT(16); =20 if (i =3D=3D 0) { TargetContent =3D (u32)(*(MacAddr + 0)) << 16 | diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index e88963a4b1f1..330dafd62656 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -292,25 +292,25 @@ static void _rtl92e_dm_check_rate_adaptive(struct net= _device *dev) ht_info->bCurShortGI20MHz); =20 pra->upper_rssi_threshold_ratr =3D - (pra->upper_rssi_threshold_ratr & (~BIT31)) | - ((bshort_gi_enabled) ? BIT31 : 0); + (pra->upper_rssi_threshold_ratr & (~BIT(31))) | + ((bshort_gi_enabled) ? BIT(31) : 0); =20 pra->middle_rssi_threshold_ratr =3D - (pra->middle_rssi_threshold_ratr & (~BIT31)) | - ((bshort_gi_enabled) ? BIT31 : 0); + (pra->middle_rssi_threshold_ratr & (~BIT(31))) | + ((bshort_gi_enabled) ? BIT(31) : 0); =20 if (priv->current_chnl_bw !=3D HT_CHANNEL_WIDTH_20) { pra->low_rssi_threshold_ratr =3D - (pra->low_rssi_threshold_ratr_40M & (~BIT31)) | - ((bshort_gi_enabled) ? BIT31 : 0); + (pra->low_rssi_threshold_ratr_40M & (~BIT(31))) | + ((bshort_gi_enabled) ? BIT(31) : 0); } else { pra->low_rssi_threshold_ratr =3D - (pra->low_rssi_threshold_ratr_20M & (~BIT31)) | - ((bshort_gi_enabled) ? BIT31 : 0); + (pra->low_rssi_threshold_ratr_20M & (~BIT(31))) | + ((bshort_gi_enabled) ? BIT(31) : 0); } pra->ping_rssi_ratr =3D - (pra->ping_rssi_ratr & (~BIT31)) | - ((bshort_gi_enabled) ? BIT31 : 0); + (pra->ping_rssi_ratr & (~BIT(31))) | + ((bshort_gi_enabled) ? BIT(31) : 0); =20 if (pra->ratr_state =3D=3D DM_RATR_STA_HIGH) { high_rssi_thresh_for_ra =3D pra->high2low_rssi_thresh_for_ra; diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index 519a3160933b..a43a5142e96f 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -7,29 +7,6 @@ #ifndef __INC_QOS_TYPE_H #define __INC_QOS_TYPE_H =20 -#define BIT10 0x00000400 -#define BIT11 0x00000800 -#define BIT12 0x00001000 -#define BIT13 0x00002000 -#define BIT14 0x00004000 -#define BIT15 0x00008000 -#define BIT16 0x00010000 -#define BIT17 0x00020000 -#define BIT18 0x00040000 -#define BIT19 0x00080000 -#define BIT20 0x00100000 -#define BIT21 0x00200000 -#define BIT22 0x00400000 -#define BIT23 0x00800000 -#define BIT24 0x01000000 -#define BIT25 0x02000000 -#define BIT26 0x04000000 -#define BIT27 0x08000000 -#define BIT28 0x10000000 -#define BIT29 0x20000000 -#define BIT30 0x40000000 -#define BIT31 0x80000000 - union qos_tsinfo { u8 charData[3]; struct { diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 7f0aa0779c78..dc3488d9693f 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1085,10 +1085,10 @@ struct rt_pwr_save_ctrl { =20 #define RT_RF_CHANGE_SOURCE u32 =20 -#define RF_CHANGE_BY_SW BIT31 -#define RF_CHANGE_BY_HW BIT30 -#define RF_CHANGE_BY_PS BIT29 -#define RF_CHANGE_BY_IPS BIT28 +#define RF_CHANGE_BY_SW BIT(31) +#define RF_CHANGE_BY_HW BIT(30) +#define RF_CHANGE_BY_PS BIT(29) +#define RF_CHANGE_BY_IPS BIT(28) #define RF_CHANGE_BY_INIT 0 =20 enum country_code_type { --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 95A14CDB474 for ; Mon, 23 Oct 2023 06:39:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233554AbjJWGj5 (ORCPT ); Mon, 23 Oct 2023 02:39:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233541AbjJWGjx (ORCPT ); Mon, 23 Oct 2023 02:39:53 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05D5CD70 for ; Sun, 22 Oct 2023 23:39:51 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-9c6f0530929so66439066b.1 for ; Sun, 22 Oct 2023 23:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043189; x=1698647989; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=1oSx7TAqwvt3r72vk49KB6i5+36XUD3K4VbaVXfPF7M=; b=c4/+cz0YrxthI23+Sgp3KYLOYaYrpAGrWUxjx4NOJ1XAe3dEykkOThXRGm7AeSJfo6 xnrS1ym42aGb84rtZmEmbcC7ksufsPjNjeWKzuwJXgxw4gFi572cVyEah0KOwgp+SBHe EHQ9BFLMlPhOpdSCTy/TAEgnVet/6mwZkjD7ooT5yUjDRO/c3zNjDi9qStPEIR+wqaU7 Nam2LWkrdJE7Rf1APCddE4XEbOeR6lJOL0sHFdh3Dk9/1SG+O7kineDGfzPu7ZUtCuCq ozwpb44XygD5O9R30MODaz4JagCEwTZ1Xeo6c4hybDxnFxJu2z4VOf0TC752vtkEH2Zd dMFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043189; x=1698647989; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1oSx7TAqwvt3r72vk49KB6i5+36XUD3K4VbaVXfPF7M=; b=JuHVT5N+sjYy1TVgUuT1++2WEsIXDlwKW4/5jwc0rqV2O07pYKzf4lgrsb0bkmCeF1 cPDNb/X46fAFbA8fI7rmb+F/j4eH0wjXmoBw22VovB5mXbARdQQW1YCvRhtN9U9ql8/U ee3um16pmUZHYUF/C4z9wFm+WXv1SGO1Jbjf4Y15tFlieIKPLSYTE2/sstj1cvQfuyf8 ZOPHguNwHoWf8jFwKCHUjIknvzgRI5WOBKfLMDMBm8KmDe+5CA6GGqg2HmTLfZ8PawMq atXSM/tB1a0N5EP4A64isXgqnAVxd/ufFskxGqEFlN7Nq0mHkEVHi22ftINHfJXqNFxW dLdQ== X-Gm-Message-State: AOJu0YxtC873krkqezekzM6Vgo7ideOvqFqY6kJUk5WP4y4Q6zhGiBr+ UtyTeFHChUuC/9DPGIrPn3shhgD2MFw= X-Google-Smtp-Source: AGHT+IFULxBeVVAI3uq6wV5dI2ulhwRLeUvmuKu2fAbDhXTWrxV+Ae2PumPeHyaJVMA6HZF2Rup4lQ== X-Received: by 2002:a17:906:cb:b0:9b2:bf2d:6b66 with SMTP id 11-20020a17090600cb00b009b2bf2d6b66mr5151513eji.7.1698043189387; Sun, 22 Oct 2023 23:39:49 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id v26-20020a17090610da00b00993a37aebc5sm6047066ejv.50.2023.10.22.23.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:39:49 -0700 (PDT) Date: Mon, 23 Oct 2023 08:39:47 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] staging: rtl8192e: Remove unused variables ucReserved and friends Message-ID: <4edfbe350e05649d1f6028777dcadb15af25238c.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused variables ucReserved, ucSchedule, ucTSInfoAckPolicy, ucPSB, ucAggregation, ucAccessPolicy, ucTrafficType and charData. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_Qos.h | 8 -------- drivers/staging/rtl8192e/rtl819x_TSProc.c | 6 ------ 2 files changed, 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index a43a5142e96f..5cdecec496e0 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -8,18 +8,10 @@ #define __INC_QOS_TYPE_H =20 union qos_tsinfo { - u8 charData[3]; struct { - u8 ucTrafficType:1; u8 ucTSID:4; u8 ucDirection:2; - u8 ucAccessPolicy:2; - u8 ucAggregation:1; - u8 ucPSB:1; u8 ucUP:3; - u8 ucTSInfoAckPolicy:2; - u8 ucSchedule:1; - u8 ucReserved:7; } field; }; =20 diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 95e735c078e4..af4d31a66853 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -318,15 +318,9 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct = ts_common_info **ppTS, netdev_dbg(ieee->dev, "to init current TS, UP:%d, Dir:%d, addr: %pM ppTs=3D%p\n", UP, Dir, addr, *ppTS); - ts_info->field.ucTrafficType =3D 0; ts_info->field.ucTSID =3D UP; ts_info->field.ucDirection =3D Dir; - ts_info->field.ucAccessPolicy =3D 1; - ts_info->field.ucAggregation =3D 0; - ts_info->field.ucPSB =3D 0; ts_info->field.ucUP =3D UP; - ts_info->field.ucTSInfoAckPolicy =3D 0; - ts_info->field.ucSchedule =3D 0; =20 MakeTSEntry(*ppTS, addr, &TSpec, NULL, 0, 0); list_add_tail(&((*ppTS)->List), pAddmitList); --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 ADBCDC001E0 for ; Mon, 23 Oct 2023 06:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233559AbjJWGkM (ORCPT ); Mon, 23 Oct 2023 02:40:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233578AbjJWGkF (ORCPT ); Mon, 23 Oct 2023 02:40:05 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C426D6E for ; Sun, 22 Oct 2023 23:40:01 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9c96a82e93bso33725766b.0 for ; Sun, 22 Oct 2023 23:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043199; x=1698647999; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=8Y5DjY0fyjQw4FmJ3KRfuE40fsBqLvsoancRvTj6d54=; b=Z+j6shu6JPz17+th00THkdC15kdRCt4UEZDrh+OZydVn587w4ThVTpUu4LgNRcQlbg wmSUukpr34/eimXfl+a587y7HHQ0W8yNkpuqikqvaV3mE3sefgRx6L1ob4m411BoXV1o YmhYodFWMnTpUlatEx2q1KcnahvNhm2E+gmAnWmfHuiaU/twN/+kawIlFfSYHAy0eWdx +/TTw+gpBB9YuJqfixXJfYU4ZKGn1DL03LscO2sRH4YDWFew7CUsd9+NpRJ64EPmn1NV zl9x0l3J0n/M0kiNNyb/u6E51T4YpWs++cKhUZa4VQjKVi2j0po9B4P701sO+14o2jV+ bC+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043199; x=1698647999; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8Y5DjY0fyjQw4FmJ3KRfuE40fsBqLvsoancRvTj6d54=; b=iKkpcPDMWv/o+1ZxEmaA+OONlho6TbxPNDAXogrY6+oKKS49yHTjkHmylVDAF65pLl 5hFWp+IOtLoAdagIpvsfIFxQ8yGlPWTuMEnG+qwbQu7n6IjkGCU3ddOdljE491E2eeoH DxBNAAs+K46CKPxg3U5y9+nVgwk2gsGbPs70c19kV/XtQSQDqJ0gKRYzmA79pnDc3Kcc fxo8wlnZVo4aMpLhSjszJQpQyYo/2HcGqC1017IqJdo8EcxR7XdsfNxbn5EExHMYdcCm pNj7mVwirDdud9akisSU+9fMsuHLSRQXXB1k+GQk8/kphakmBEDrRu8btF8iPr8sBSkS nvvA== X-Gm-Message-State: AOJu0Ywda/SyyiOEl8+XMy3FxgXbudoT6prdAk/KXIC+E1L1As8NA5pU qgAxO+hbu998JhPduOCDCt0= X-Google-Smtp-Source: AGHT+IHYMKHz44gyX9I+1TKCNnnSYaKVJmXf/24AVyP3Hxk6Uyo5yKZYJGyqosDUiFxwmTm1Jh6xYQ== X-Received: by 2002:a17:906:74d1:b0:9ad:e1e2:3595 with SMTP id z17-20020a17090674d100b009ade1e23595mr5263127ejl.7.1698043199372; Sun, 22 Oct 2023 23:39:59 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id a19-20020a170906469300b0099bd0b5a2bcsm6117011ejr.101.2023.10.22.23.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:39:59 -0700 (PDT) Date: Mon, 23 Oct 2023 08:39:57 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] staging: rtl8192e: Remove written but unevaluated variable ucUP Message-ID: <724cf398d27f74cb7e0f290e1a8e55ed67dffcc3.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove variable ucUP as its value is written but never evaluated. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_Qos.h | 1 - drivers/staging/rtl8192e/rtl819x_TSProc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index 5cdecec496e0..7f086b7a1b88 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -11,7 +11,6 @@ union qos_tsinfo { struct { u8 ucTSID:4; u8 ucDirection:2; - u8 ucUP:3; } field; }; =20 diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index af4d31a66853..879e169539c8 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -320,7 +320,6 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct t= s_common_info **ppTS, UP, Dir, addr, *ppTS); ts_info->field.ucTSID =3D UP; ts_info->field.ucDirection =3D Dir; - ts_info->field.ucUP =3D UP; =20 MakeTSEntry(*ppTS, addr, &TSpec, NULL, 0, 0); list_add_tail(&((*ppTS)->List), pAddmitList); --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 776A2C001E0 for ; Mon, 23 Oct 2023 06:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233544AbjJWGk0 (ORCPT ); Mon, 23 Oct 2023 02:40:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233573AbjJWGkL (ORCPT ); Mon, 23 Oct 2023 02:40:11 -0400 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 9A64ED67 for ; Sun, 22 Oct 2023 23:40:07 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9c96a82e93bso33727566b.0 for ; Sun, 22 Oct 2023 23:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043206; x=1698648006; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=rEMPoaqrAr584bmhMHYdUsDhpy12wr+01QsM/BCHbCI=; b=E9B+/glL55ltJcsdyRfdki0l/o7yhIAdZRLOyd8FaJUV52/IiZ8/wvjFU7nxJbVMy6 rPFvSCA0Lh41RKTW8CwZyGctoYT0U3wK9eciuUVg3oolDcHmGvwBsLAUibF2hs9ShR+f EAx0swPyGPGqqIgsTW6JF6QqRRFuyaWuRiFUHLkUAsjW8zDDHT2yDe2jGcLkbd6SWGj5 IiPF6WMoHfsiITSNb0rpFEgEKniZLCe5cJzPr/t5XQAxWkkCCebUXwkvNMGKYwpzkgBm 2LvnZdVOfqcNenycVJIefdb1IvcRj+j7AllfaLcyjcqCpZedY88tOlfGou07UIWBCvRv C3Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043206; x=1698648006; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rEMPoaqrAr584bmhMHYdUsDhpy12wr+01QsM/BCHbCI=; b=wIQ73xZvk1Pg55CyStXh5wA/j2VobgWESVzHuCwNN8/+O6kl28+AOi3yNHtnT7oupW Yclt58WlGKSrFDv5sc3xRrWXvT8+VpqZ2FzXvLQROYTZx+pTUdem5N0zpf7qj1CC05xN b2erJA6iDlq3qvlrdqiLYFi1+O5SMnYCN0bzgGZF7yH7UjE/Tqdf8Bv8k98cexxuOad1 lLb2fO5YJDtrqaUOcwvAVbPr23I6Adn6GvjrntDGCMiUxqYrzTvdgj1eVf5iKUBkg8hW fbjQehqFcOwWKjo2Un68f9UbNpegbjZf5MzHz9YmSlvP2rWMlcuLIGwmALQnN32r4RJp qdRw== X-Gm-Message-State: AOJu0YygmQAGbK7u/YBXmXTnoPtRMdJpIEJkx9426xUIiribZp+aC2i1 znf4TQOW4oXy5A0SLlD4Reg= X-Google-Smtp-Source: AGHT+IEJEXXXpjEX50Iazdue/9QtEDeAgzztPJ8RGywLw8vA7t4HM4MMUXDezIS/uFkV8zbGBQnpPA== X-Received: by 2002:a17:906:14da:b0:9c9:f8a3:621f with SMTP id y26-20020a17090614da00b009c9f8a3621fmr1549799ejc.6.1698043205996; Sun, 22 Oct 2023 23:40:05 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id v18-20020a1709063bd200b009737b8d47b6sm6026532ejf.203.2023.10.22.23.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:05 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:04 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] staging: rtl8192e: Remove unused variables from union tspec_body Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused variables to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_Qos.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index 7f086b7a1b88..ac321952f7b3 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -15,25 +15,8 @@ union qos_tsinfo { }; =20 union tspec_body { - u8 charData[55]; - struct { union qos_tsinfo ts_info; - u16 NominalMSDUsize; - u16 MaxMSDUsize; - u32 MinServiceItv; - u32 MaxServiceItv; - u32 InactivityItv; - u32 SuspenItv; - u32 ServiceStartTime; - u32 MinDataRate; - u32 MeanDataRate; - u32 PeakDataRate; - u32 MaxBurstSize; - u32 DelayBound; - u32 MinPhyRate; - u16 SurplusBandwidthAllowance; - u16 MediumTime; } f; }; =20 --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 44E8FC001E0 for ; Mon, 23 Oct 2023 06:40:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233575AbjJWGkc (ORCPT ); Mon, 23 Oct 2023 02:40:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233543AbjJWGkU (ORCPT ); Mon, 23 Oct 2023 02:40:20 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26661188 for ; Sun, 22 Oct 2023 23:40:14 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-53db2f8d193so1002836a12.0 for ; Sun, 22 Oct 2023 23:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043212; x=1698648012; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=IAg5aOPrhHSpwz3YYSAWUDYY5nI8Lv/rAsYemdyOjfQ=; b=UXOEE0osF+G34szgQTgtuBaE8O78EjTmt9AKxvpwDYJ3jxnwCTaWEZw4losQoQHXc5 5tn9S+dR3Ly0E1bVbqnqvoZMRsoT60LrXfHgI+RG+VAHOelsIMrLSwKewmTRg60HwmTs /0Ml1gzOB6Tp785ynxAobt/jpbsqWdX97TsDSCtpLbJ8ZT68/S6oHAbsGLF8iRGqj5py u10J7HK2wOCpYBv0kQMeLwVetgF7Zk8cFOwtK+TEHsHQnqiRYOmivq7Y6LJG7VcJBfH8 92N3YJ7TaGqnJM0dOhENw0wpPt7oZnf5SA6dfGW87HXJuV18HgSOWRhroWdvbxTblmhz TRVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043212; x=1698648012; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IAg5aOPrhHSpwz3YYSAWUDYY5nI8Lv/rAsYemdyOjfQ=; b=Vg16wyiNlOGloFo4Fz9BvDgQMCsuLfHtQBtrILYIcU1oJfeDkkQAtD97LH7hINJcHo nHfY96JgsScg2yapt4JwQ5J5w+fZsW2LCdqcrApo82NrmuhfFAqW1TQJqlAxdfdia15T KiGURlkHWFgJaAafF3NvrBqrZEMkC8+YqDzAvA4VErpp2eT+waHU0OFKgphHs9+AkxnH r7yNCcYKaOSVu7C91G66DNRPbyHQST3etuW4agaaKUv/wdCNyB3lTvFVxhxHkVENaExE dy4pGicB2Xz/qn60zanDPR1qYA1h/PgdFlb0FSRKk20b36hRkv9PrFBRgBcziA5HyvX3 VKZw== X-Gm-Message-State: AOJu0Yz3kKWwvapyvbeM2fPximNC11fIv2DwldgYH2sFI0KvaIQH+uNA +Enqhi4wunjhaPI57n4l3FU= X-Google-Smtp-Source: AGHT+IFHOEYzDi5J8//nYm81RM+jNIwzQ45UxSrIvCWXnqmy6JN1axrcPrq+KLj+1Y3gt+WyYtr6lw== X-Received: by 2002:a05:6402:e8b:b0:540:488:dfd8 with SMTP id h11-20020a0564020e8b00b005400488dfd8mr4258103eda.4.1698043212567; Sun, 22 Oct 2023 23:40:12 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id dm28-20020a05640222dc00b0053def18ee8bsm5766997edb.20.2023.10.22.23.40.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:12 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:10 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] staging: rtl8192e: Replace union tspec_body including embedded struct Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace union tspec_body including embedded struct with embedded union as it has only one element. This will increase readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 6 ------ drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 14 +++++++------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index 93b566482149..f01fb7131c7e 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -474,7 +474,7 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, = struct tx_ts_record *ts, ba->dialog_token++; ba->ba_param_set.field.amsdu_support =3D 0; ba->ba_param_set.field.ba_policy =3D policy; - ba->ba_param_set.field.tid =3D ts->TsCommonInfo.TSpec.f.ts_info.field.ucT= SID; + ba->ba_param_set.field.tid =3D ts->TsCommonInfo.TSpec.field.ucTSID; ba->ba_param_set.field.buffer_size =3D 32; ba->ba_timeout_value =3D 0; ba->ba_start_seq_ctrl.field.seq_num =3D (ts->TxCurSeq + 3) % 4096; diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index ac321952f7b3..73fdf6aaed67 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -14,12 +14,6 @@ union qos_tsinfo { } field; }; =20 -union tspec_body { - struct { - union qos_tsinfo ts_info; - } f; -}; - struct octet_string { u8 *Octet; u16 Length; diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index a9770592a8c9..ed77763bb1fc 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -20,7 +20,7 @@ enum tr_select { struct ts_common_info { struct list_head List; u8 addr[ETH_ALEN]; - union tspec_body TSpec; + union qos_tsinfo TSpec; union qos_tclas TClass[TCLAS_NUM]; u8 TClasProc; u8 TClasNum; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 879e169539c8..969418031f5f 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -94,7 +94,7 @@ static void TsAddBaProcess(struct timer_list *t) static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) { eth_zero_addr(pTsCommonInfo->addr); - memset(&pTsCommonInfo->TSpec, 0, sizeof(union tspec_body)); + memset(&pTsCommonInfo->TSpec, 0, sizeof(union qos_tsinfo)); memset(&pTsCommonInfo->TClass, 0, sizeof(union qos_tclas) * TCLAS_NUM); pTsCommonInfo->TClasProc =3D 0; pTsCommonInfo->TClasNum =3D 0; @@ -201,8 +201,8 @@ static struct ts_common_info *SearchAdmitTRStream(struc= t rtllib_device *ieee, continue; list_for_each_entry(pRet, psearch_list, List) { if (memcmp(pRet->addr, addr, 6) =3D=3D 0 && - pRet->TSpec.f.ts_info.field.ucTSID =3D=3D TID && - pRet->TSpec.f.ts_info.field.ucDirection =3D=3D dir) + pRet->TSpec.field.ucTSID =3D=3D TID && + pRet->TSpec.field.ucDirection =3D=3D dir) break; } if (&pRet->List !=3D psearch_list) @@ -215,7 +215,7 @@ static struct ts_common_info *SearchAdmitTRStream(struc= t rtllib_device *ieee, } =20 static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *addr, - union tspec_body *pTSPEC, union qos_tclas *pTCLAS, + union qos_tsinfo *pTSPEC, union qos_tclas *pTCLAS, u8 TCLAS_Num, u8 TCLAS_Proc) { u8 count; @@ -227,7 +227,7 @@ static void MakeTSEntry(struct ts_common_info *pTsCommo= nInfo, u8 *addr, =20 if (pTSPEC) memcpy((u8 *)(&(pTsCommonInfo->TSpec)), (u8 *)pTSPEC, - sizeof(union tspec_body)); + sizeof(union qos_tsinfo)); =20 for (count =3D 0; count < TCLAS_Num; count++) memcpy((u8 *)(&(pTsCommonInfo->TClass[count])), @@ -241,8 +241,8 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct t= s_common_info **ppTS, u8 *addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs) { u8 UP =3D 0; - union tspec_body TSpec; - union qos_tsinfo *ts_info =3D &TSpec.f.ts_info; + union qos_tsinfo TSpec; + union qos_tsinfo *ts_info =3D &TSpec; struct list_head *pUnusedList; struct list_head *pAddmitList; enum direction_value Dir; --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 D820FC001E0 for ; Mon, 23 Oct 2023 06:40:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233542AbjJWGkf (ORCPT ); Mon, 23 Oct 2023 02:40:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233586AbjJWGkX (ORCPT ); Mon, 23 Oct 2023 02:40:23 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 557C510C8 for ; Sun, 22 Oct 2023 23:40:21 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5221bd8f62eso992265a12.1 for ; Sun, 22 Oct 2023 23:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043220; x=1698648020; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=/TeDhj4M7bfk1ZuzV/MaUrRjjWL2B2L9H9sMD0IpBps=; b=A783w1Ds8Z1GhLTwNRnjw+Jto+Suyq/zVRywWs/1lSByXovup8byxz7HiPlMktHVt7 UuEgqCgZuOY/yYtEV0nr8+53iAspfq/BTxrFmZOLeh4ng23QgGWpDwFKfP6ipnKOWKQG aG8/vX1YO/ssbOA61tLCQbTWKpwXuNbxrlrknbYWXYULbo1HydIggmfbkeUrHlgJ1jJX eqGpMalltVyFoSWXueloEIyrSMrT3Pnkq7RiSeRMTk/EXXV8+cWVRZq1cjnbtaPsMh9/ WR+HJzcpCJrMqp5+aCUgTqgw9UsgZ+JuTWpgBhHjNxXvuDinPMphGRRU1udYo13a3MwI K0dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043220; x=1698648020; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/TeDhj4M7bfk1ZuzV/MaUrRjjWL2B2L9H9sMD0IpBps=; b=Qki4+J9DF1nI00QtPFLocba059wU45/FuICa+JZIHsba12faiCvOJINLs4y6d5qhqc B2dqxIqEaNN0sSq8Q5bnB0za7v9IxkxVZlyNz9yXbf3fdlL2ZylLpGhKCBILur/0mkHg acNp/XmF7MxDjo9K4pZHRzRnktsvZW8fYD+0Os3OjjctBF7rGxjOGsQOecFXN8Dw4vIr tubWvxnGYPjUzEn4oJ+84eA3OSGJilUqBry4S/DLDTAGil53K7ke+Vp4UM7de7TKAHSA I1OARRvUbXq7I7EPkb5e5ipipdDXDkMvERGA9a6fq1MONMvne4dolyO/Th4FYmwyOjSK Edtg== X-Gm-Message-State: AOJu0YxsKVuVH68GT5QMvEkYmFJPP6b2ftBP2fi2EEbHkUreLve7f4qC xh9Buwt+tbfcOHQQrmnVIHo= X-Google-Smtp-Source: AGHT+IEVl5rNN4V55TPK/F5/vTw4pBk90mC64nnhAXlgmL+QPISSIUKWfCwD+kz26kb6HojEESAXrQ== X-Received: by 2002:a17:906:225c:b0:9be:f78a:d438 with SMTP id 28-20020a170906225c00b009bef78ad438mr6701960ejr.5.1698043219752; Sun, 22 Oct 2023 23:40:19 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id j21-20020a170906279500b009c7558b39fasm6164323ejc.194.2023.10.22.23.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:19 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:18 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] staging: rtl8192e: Replace union qos_tsinfo with embedded struct Message-ID: <3bedc504ad678332e4ab2a3d99f2a94ab5aed03a.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace union qos_tsinfo with embedded struct as it has only one element. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 8 +++----- drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 18 +++++++++--------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index f01fb7131c7e..4af8055d2489 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -474,7 +474,7 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, = struct tx_ts_record *ts, ba->dialog_token++; ba->ba_param_set.field.amsdu_support =3D 0; ba->ba_param_set.field.ba_policy =3D policy; - ba->ba_param_set.field.tid =3D ts->TsCommonInfo.TSpec.field.ucTSID; + ba->ba_param_set.field.tid =3D ts->TsCommonInfo.TSpec.ucTSID; ba->ba_param_set.field.buffer_size =3D 32; ba->ba_timeout_value =3D 0; ba->ba_start_seq_ctrl.field.seq_num =3D (ts->TxCurSeq + 3) % 4096; diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index 73fdf6aaed67..64a1e6aa501b 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -7,11 +7,9 @@ #ifndef __INC_QOS_TYPE_H #define __INC_QOS_TYPE_H =20 -union qos_tsinfo { - struct { - u8 ucTSID:4; - u8 ucDirection:2; - } field; +struct qos_tsinfo { + u8 ucTSID:4; + u8 ucDirection:2; }; =20 struct octet_string { diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index ed77763bb1fc..b63edb815902 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -20,7 +20,7 @@ enum tr_select { struct ts_common_info { struct list_head List; u8 addr[ETH_ALEN]; - union qos_tsinfo TSpec; + struct qos_tsinfo TSpec; union qos_tclas TClass[TCLAS_NUM]; u8 TClasProc; u8 TClasNum; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 969418031f5f..fbbe538f0632 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -94,7 +94,7 @@ static void TsAddBaProcess(struct timer_list *t) static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) { eth_zero_addr(pTsCommonInfo->addr); - memset(&pTsCommonInfo->TSpec, 0, sizeof(union qos_tsinfo)); + memset(&pTsCommonInfo->TSpec, 0, sizeof(struct qos_tsinfo)); memset(&pTsCommonInfo->TClass, 0, sizeof(union qos_tclas) * TCLAS_NUM); pTsCommonInfo->TClasProc =3D 0; pTsCommonInfo->TClasNum =3D 0; @@ -201,8 +201,8 @@ static struct ts_common_info *SearchAdmitTRStream(struc= t rtllib_device *ieee, continue; list_for_each_entry(pRet, psearch_list, List) { if (memcmp(pRet->addr, addr, 6) =3D=3D 0 && - pRet->TSpec.field.ucTSID =3D=3D TID && - pRet->TSpec.field.ucDirection =3D=3D dir) + pRet->TSpec.ucTSID =3D=3D TID && + pRet->TSpec.ucDirection =3D=3D dir) break; } if (&pRet->List !=3D psearch_list) @@ -215,7 +215,7 @@ static struct ts_common_info *SearchAdmitTRStream(struc= t rtllib_device *ieee, } =20 static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *addr, - union qos_tsinfo *pTSPEC, union qos_tclas *pTCLAS, + struct qos_tsinfo *pTSPEC, union qos_tclas *pTCLAS, u8 TCLAS_Num, u8 TCLAS_Proc) { u8 count; @@ -227,7 +227,7 @@ static void MakeTSEntry(struct ts_common_info *pTsCommo= nInfo, u8 *addr, =20 if (pTSPEC) memcpy((u8 *)(&(pTsCommonInfo->TSpec)), (u8 *)pTSPEC, - sizeof(union qos_tsinfo)); + sizeof(struct qos_tsinfo)); =20 for (count =3D 0; count < TCLAS_Num; count++) memcpy((u8 *)(&(pTsCommonInfo->TClass[count])), @@ -241,8 +241,8 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct t= s_common_info **ppTS, u8 *addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs) { u8 UP =3D 0; - union qos_tsinfo TSpec; - union qos_tsinfo *ts_info =3D &TSpec; + struct qos_tsinfo TSpec; + struct qos_tsinfo *ts_info =3D &TSpec; struct list_head *pUnusedList; struct list_head *pAddmitList; enum direction_value Dir; @@ -318,8 +318,8 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct t= s_common_info **ppTS, netdev_dbg(ieee->dev, "to init current TS, UP:%d, Dir:%d, addr: %pM ppTs=3D%p\n", UP, Dir, addr, *ppTS); - ts_info->field.ucTSID =3D UP; - ts_info->field.ucDirection =3D Dir; + ts_info->ucTSID =3D UP; + ts_info->ucDirection =3D Dir; =20 MakeTSEntry(*ppTS, addr, &TSpec, NULL, 0, 0); list_add_tail(&((*ppTS)->List), pAddmitList); --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 31DBBC001E0 for ; Mon, 23 Oct 2023 06:40:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233655AbjJWGku (ORCPT ); Mon, 23 Oct 2023 02:40:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233578AbjJWGk3 (ORCPT ); Mon, 23 Oct 2023 02:40:29 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27AEBD70 for ; Sun, 22 Oct 2023 23:40:27 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-9bf941607d4so87940466b.1 for ; Sun, 22 Oct 2023 23:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043225; x=1698648025; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=O32Xy7uTc0KBQdpx2+7nBOVID0EODs+Xiq0NbRF0/Gw=; b=YUNWVEV9QdX5nC5A/iMatTWiMd8TRMrhsN3HElXYUNiD8/0JL7sGZ01VanzYuNWumu hQFruK6c3EzUDqojlFixURQE+V3YmyCXj7LqdCirf5OM2EgsP0AdV3AeGF6p+ld2B/w4 wczq74GWnDiTvlXDgVwRAqZXw2CtamvE40LpocuD0z6mzuL3Jcvz48Vu61dRBS1NUEUb KyIOruA2Fz2ZLX25R67ceumKYfn0eEnwlmvuoOW7nMBeW1flWzjtuANqxQykYlOLmjsF F16u7Hc15gLrh/lSCXLkNTp8OpOfTYo/N1EQMH2OkGnt2WBGoQxoH8B9TqACueXyoilo IkJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043225; x=1698648025; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=O32Xy7uTc0KBQdpx2+7nBOVID0EODs+Xiq0NbRF0/Gw=; b=knmPTA2IGySrczntaRkHAEb4SS0VfVlA9GjqYQoLLQwRTAjDRs7re+cjbRvMMvpYFb +u0ABIv42jUNgIrA+PzSw7ChmExc8yAyxd5h9sZE7uYcModItiusABepOPMUyb08T20/ HBOg5uEvIeKHnA5tpqR99WToDX96GGVJW7Fx+WvcOf1XopkdXRNmem1XmSI936+JBWMC UnK8dNAYMMfgx+LvwtC+uLOob0Egmr0YsjgcqRRAC2ixtpg3vgOOk57rBA2PlClnkU17 WivGBnehqeM08Yw5vWZ1mjpMDe1pNVLpB1nN9MIoFXoabwautxzYiSmrcJ7G+0vit9lI Vj7Q== X-Gm-Message-State: AOJu0YwxXc3f5WKod+x2HLZ4nMHT3ybxMJPIW4xrbzvI2ynndPJCPzEj Ae6TuhP9kICprfdSesvvQ5M= X-Google-Smtp-Source: AGHT+IFp6WEqRkJmwd+UcsT/0c445+Pv7mExviTP11F0KCVzyJ9Xpn7PTnhgb8r5XTSrcRUuPIlbqg== X-Received: by 2002:a17:906:10cd:b0:9be:4cf4:d62e with SMTP id v13-20020a17090610cd00b009be4cf4d62emr6588314ejv.5.1698043225572; Sun, 22 Oct 2023 23:40:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id y6-20020a17090668c600b009c7608eb499sm6123817ejr.94.2023.10.22.23.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:25 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:23 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] staging: rtl8192e: Remove unused struct acm Message-ID: <5cc31651cbf63e11c4172b4e42274dd862a7c310.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused struct acm to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_Qos.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index 64a1e6aa501b..9a9ef5fef6e0 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -30,12 +30,6 @@ enum direction_value { DIR_BI_DIR =3D 3, }; =20 -struct acm { - u64 UsedTime; - u64 MediumTime; - u8 HwAcmCtl; -}; - union qos_tclas { struct _TYPE_GENERAL { u8 Priority; --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 66DAFCDB474 for ; Mon, 23 Oct 2023 06:40:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233689AbjJWGk5 (ORCPT ); Mon, 23 Oct 2023 02:40:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233588AbjJWGkg (ORCPT ); Mon, 23 Oct 2023 02:40:36 -0400 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 A27F010E2 for ; Sun, 22 Oct 2023 23:40:34 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9c14313eb1cso78560466b.0 for ; Sun, 22 Oct 2023 23:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043233; x=1698648033; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=RsMa50p68QhR354G2viJMWnZKa/lXMk6KHxdlxw2gzI=; b=LLtMeARRNEk6WlW4hvZUgad0aMot+miJFKYSdM5r8l5LBi2Yo1GlAiJ88jYIAfiwc7 YpbTqemQp3l5+ur6MRf9HZdwgVzu7VePus1VXn/VckxKbvij+WjUF3niDDvMKMwN2X8f htpSsas5uX/qBLhW3MMx4MMYbnfFKdWolP/qYIbrVSBcGaC34we3LzjFX29tN0d/+GoL iOWrbmQKuUICeqEIBiDBrqnxB9k1SvKwtXdMF1K0+ikzSjvdmDG/I+6YwgXHOrgvbXpv JPi5JxHsgs4ivdcp+8LdrU3Ls4W3YN/nnoZ3HpJAW3QuBrajq4bzz+SbEyl4K4ecj1Uw 3e+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043233; x=1698648033; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RsMa50p68QhR354G2viJMWnZKa/lXMk6KHxdlxw2gzI=; b=urZEpi+l50/VWp+FxLXWiSvDvyEfZv/Vr+vNMa/K4TEov4Lm3EnElCFB0gThSyFSN5 in3xCNZtwB/0zsI/k2UbXWY54ZP4eOCOBoSRFTkuugCWQ45bAtXeyXVGxulHZ+5ZwSTJ BmJ9MZ6pvXhLVf2GKbOT6S/7j4FyAjp28a1r+fuSP28thV8zpyG7GaNAYCc1ZzjE4QPm TzCBWUgW12NBLV9AeK6lsxYnNntfAqyYGgFQbBvU9ol8smYL+I/bhhKMKrDM7xZ8cQKD SE5Ne4AGz1cjsuFZGl7EczUu+u9j4qPVQ+8uwSwXXdIRxfRlZN4oJVwsN/Jbml/CKnuz pm2g== X-Gm-Message-State: AOJu0YzTqJ69GfkOMFSEBS10CS4+0d9YJoREKzCEHwGh8yx2sOB3o1tf 5VJh0CLoDAmTqhvCE/559X0= X-Google-Smtp-Source: AGHT+IEsdcmaU2zY9FGIdiFU06ARn586Mzhve6d4j/27ev1POhNcYfLkiBTs79P6+rnoWvGp6FqQDg== X-Received: by 2002:a17:906:51ce:b0:9ae:2f35:442a with SMTP id v14-20020a17090651ce00b009ae2f35442amr4689670ejk.5.1698043233066; Sun, 22 Oct 2023 23:40:33 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id gx13-20020a1709068a4d00b009ae6a6451fdsm6085254ejc.35.2023.10.22.23.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:32 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:31 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] staging: rtl8192e: Remove last three parameters of MakeTSEntry() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove last three parameters of MakeTSEntry() as those are always Null or 0. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_TSProc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index fbbe538f0632..96022c5ed60f 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -215,11 +215,8 @@ static struct ts_common_info *SearchAdmitTRStream(stru= ct rtllib_device *ieee, } =20 static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *addr, - struct qos_tsinfo *pTSPEC, union qos_tclas *pTCLAS, - u8 TCLAS_Num, u8 TCLAS_Proc) + struct qos_tsinfo *pTSPEC) { - u8 count; - if (!pTsCommonInfo) return; =20 @@ -228,13 +225,6 @@ static void MakeTSEntry(struct ts_common_info *pTsComm= onInfo, u8 *addr, if (pTSPEC) memcpy((u8 *)(&(pTsCommonInfo->TSpec)), (u8 *)pTSPEC, sizeof(struct qos_tsinfo)); - - for (count =3D 0; count < TCLAS_Num; count++) - memcpy((u8 *)(&(pTsCommonInfo->TClass[count])), - (u8 *)pTCLAS, sizeof(union qos_tclas)); - - pTsCommonInfo->TClasProc =3D TCLAS_Proc; - pTsCommonInfo->TClasNum =3D TCLAS_Num; } =20 bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppT= S, @@ -321,7 +311,7 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct t= s_common_info **ppTS, ts_info->ucTSID =3D UP; ts_info->ucDirection =3D Dir; =20 - MakeTSEntry(*ppTS, addr, &TSpec, NULL, 0, 0); + MakeTSEntry(*ppTS, addr, &TSpec); list_add_tail(&((*ppTS)->List), pAddmitList); =20 return true; --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 E171AC001E0 for ; Mon, 23 Oct 2023 06:41:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233578AbjJWGlL (ORCPT ); Mon, 23 Oct 2023 02:41:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233558AbjJWGkt (ORCPT ); Mon, 23 Oct 2023 02:40:49 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EA3D1710 for ; Sun, 22 Oct 2023 23:40:40 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-53e2308198dso866770a12.1 for ; Sun, 22 Oct 2023 23:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043238; x=1698648038; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=F8Js+K75dwM2UqnvWvlit1BEMnTsZVyd0yFufnZLxQg=; b=CXK0fnOXH0HmflS8gtDIOthHZXQfh+Q407syByslj/owxlGcL6jLqpZgEJTsFQ0K4G fcTYSD+Di55b8b48UJujbXzjLRTA+xB2qJ4Wk3/vQt11MYQHX3jNrs5WEd8HzqT7TGYU g8CfESEnU4fTMKgJ63a9RMMhtKxHRn9BRRmS7xNJbyNITMvXKvrWIBTMrSNaDQ5y/BZk MSz+sr/gVaIldi0wmHFwf4fBu+Qf2xipvEXqWVfTzYOgcbnHeTINS+C1G/DAgkp4MGzz 6qK+KdXp4mdxRzDLpGtceXZTZ9+LuN0TWCo8egHnKjSdrKwY4rR8S7z3G9JO7pYADiPV rqZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043238; x=1698648038; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=F8Js+K75dwM2UqnvWvlit1BEMnTsZVyd0yFufnZLxQg=; b=cXLVmv8IX3MQC8slwOrcCMuTSmDSv2Wva7aYqJMOP2Y9N+1djHNztddlsTkDhb0f7M Oujy1FvBAyEDih2NHK4GN+Ex4JJb2c5PPJQCFHv4TGXsajOuggmFYZvg9gBQ2ANcYdEE EyAQFoTZUwq5v5imV9Eq09XNVrxjabmLoQ9j0yJ1v5Q2xYxn4CipLRRakNuQXXQ/KxhO 3rKfgfSlX62elXzoHWHBPrjcCDV6TK2mkTZgxn3FEljBUQPLt5UXvHfewlLBO9/Onwcu c2njQUbMH61uqWwQ9VrR2/o8PXAByitnOqoY6Vh7Rwf9C6wYD6E3c/Gg8c+yg0BEwY5V 93hQ== X-Gm-Message-State: AOJu0YzEL1Xf/LSr0RofefgVajpuZKx0lk69gwO8EjrOq/txRkTVkC3v XUTvIh2gfaDVn3c7X++Vyl0= X-Google-Smtp-Source: AGHT+IGeNxy5iZyPzydLlwqRkupI3US48jdW+Lm2LCjHSfw5WfIbtXsOBr6EO1UyXcxVp6+kZLtaVQ== X-Received: by 2002:aa7:c592:0:b0:53f:ca25:c580 with SMTP id g18-20020aa7c592000000b0053fca25c580mr6075622edq.1.1698043238550; Sun, 22 Oct 2023 23:40:38 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id s2-20020a50d482000000b0053ddbfa71ddsm5874405edi.47.2023.10.22.23.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:38 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:36 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] staging: rtl8192e: Remove unused union qos_tclas Message-ID: <7e4d32fe7a1219a9131ce49308f68790e07fb83e.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove union qos_tclas as it is just set to 0 and never used. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_Qos.h | 50 ----------------------- drivers/staging/rtl8192e/rtl819x_TS.h | 1 - drivers/staging/rtl8192e/rtl819x_TSProc.c | 1 - 3 files changed, 52 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index 9a9ef5fef6e0..f547de4c1da3 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -30,56 +30,6 @@ enum direction_value { DIR_BI_DIR =3D 3, }; =20 -union qos_tclas { - struct _TYPE_GENERAL { - u8 Priority; - u8 ClassifierType; - u8 Mask; - } TYPE_GENERAL; - - struct _TYPE0_ETH { - u8 Priority; - u8 ClassifierType; - u8 Mask; - u8 SrcAddr[ETH_ALEN]; - u8 DstAddr[ETH_ALEN]; - u16 Type; - } TYPE0_ETH; - - struct _TYPE1_IPV4 { - u8 Priority; - u8 ClassifierType; - u8 Mask; - u8 Version; - u8 SrcIP[4]; - u8 DstIP[4]; - u16 SrcPort; - u16 DstPort; - u8 DSCP; - u8 Protocol; - u8 Reserved; - } TYPE1_IPV4; - - struct _TYPE1_IPV6 { - u8 Priority; - u8 ClassifierType; - u8 Mask; - u8 Version; - u8 SrcIP[16]; - u8 DstIP[16]; - u16 SrcPort; - u16 DstPort; - u8 FlowLabel[3]; - } TYPE1_IPV6; - - struct _TYPE2_8021Q { - u8 Priority; - u8 ClassifierType; - u8 Mask; - u16 TagType; - } TYPE2_8021Q; -}; - union aci_aifsn { u8 charData; =20 diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index b63edb815902..240e808fc4b2 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -21,7 +21,6 @@ struct ts_common_info { struct list_head List; u8 addr[ETH_ALEN]; struct qos_tsinfo TSpec; - union qos_tclas TClass[TCLAS_NUM]; u8 TClasProc; u8 TClasNum; }; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 96022c5ed60f..7151827408b9 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -95,7 +95,6 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsC= ommonInfo) { eth_zero_addr(pTsCommonInfo->addr); memset(&pTsCommonInfo->TSpec, 0, sizeof(struct qos_tsinfo)); - memset(&pTsCommonInfo->TClass, 0, sizeof(union qos_tclas) * TCLAS_NUM); pTsCommonInfo->TClasProc =3D 0; pTsCommonInfo->TClasNum =3D 0; } --=20 2.42.0 From nobody Thu Jan 1 12:24:14 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 99361C001E0 for ; Mon, 23 Oct 2023 06:41:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233613AbjJWGlT (ORCPT ); Mon, 23 Oct 2023 02:41:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233608AbjJWGkz (ORCPT ); Mon, 23 Oct 2023 02:40:55 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90C0710C4 for ; Sun, 22 Oct 2023 23:40:46 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9bf0bee9f2fso100764966b.1 for ; Sun, 22 Oct 2023 23:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043245; x=1698648045; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=usb14TKnR5nGARmhYK6QjpDq5f+Ywoldfs7WPWSHtjk=; b=lwszKBEa+0IeJyQo8Gj+9KW1H6f+C7fsvKZWfumkKTfS68wyGvX5q/jbkCZ3pmLVAK aOmWidI812ozp50mwwIKACSaU6B31aOV2yDenDTSv/48Ptmo2WrORkVrmOVUOaYcnfw0 nLAk90zBaatT7pyavdxXmYWpSX1/dHPvoZGXKO7grH40M2/A9LFSz9kZFbfWko0ou3vT AoM0pT0+llsvnYmcx9ws5zSN0SiKC/xWZVcZAWi3uVQIp48ea0ktWpDiaVTk81Wp4UZo Fdmzt+CASaaQhEBGIK2Hxbz/CzS+NZa9GU2Tf/NnGtdha+pwbw+2t6OEvI39wA/7GfsW LQzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043245; x=1698648045; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=usb14TKnR5nGARmhYK6QjpDq5f+Ywoldfs7WPWSHtjk=; b=lEPAPJaVq3ZmGgEQGqGyzl77HuPOYMSw51YoS5swELrJSnvfMCx2mGLVscuXtKRx+g Xifx6iKaQDKO7XIAxNK2WNA82TiQxONVbFApEKStVC0aZFm9rVxubNmRtDF/gs3lJw+7 L+oIZgE+Y6/znY/V7ymE+lgaBvGtZScvFuwCyZUlLaFkKb9OfzxIFJEMCkx6SyZbCWBT SS7hp7tW0kM1UzEOrWZUCpUEjB3mWj0kQpF0FpOQeWnZ6hkTmwINFsA5qYBL4JMhVDbl 05pV7o4gOXDVb0UVABR6BWrsZ747YUkW9U/bH2Os+HjkKtQl3/vAhFAZToaGgG6i60n9 rOwg== X-Gm-Message-State: AOJu0Ywc9TqOXUbVbYW+cQN3b5k4LzDFuI7xx9Y8bd0IW60AVKd1eZfo kIME4hZfikGni30bITLQG88= X-Google-Smtp-Source: AGHT+IF6ARxAGq5faUU73LlSjuP8qajtw7vveJvgBijeRWRJh4wcE9migJuJqgAIXuIuDBYnm/cfvA== X-Received: by 2002:a17:906:109:b0:9bf:b83c:5efd with SMTP id 9-20020a170906010900b009bfb83c5efdmr5050754eje.3.1698043244873; Sun, 22 Oct 2023 23:40:44 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id h13-20020a1709062dcd00b009ae54585aebsm6097878eji.89.2023.10.22.23.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:44 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:43 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] staging: rtl8192e: Remove unused variables TClasProc and TClasNum Message-ID: <04ce3eaaaf3897a22dcb95ce2f449658199770d8.1698042685.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused variables to shorten code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_TS.h | 2 -- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index 240e808fc4b2..ab737428d4a7 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -21,8 +21,6 @@ struct ts_common_info { struct list_head List; u8 addr[ETH_ALEN]; struct qos_tsinfo TSpec; - u8 TClasProc; - u8 TClasNum; }; =20 struct tx_ts_record { diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 7151827408b9..3206fdb3e65a 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -95,8 +95,6 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsC= ommonInfo) { eth_zero_addr(pTsCommonInfo->addr); memset(&pTsCommonInfo->TSpec, 0, sizeof(struct qos_tsinfo)); - pTsCommonInfo->TClasProc =3D 0; - pTsCommonInfo->TClasNum =3D 0; } =20 static void ResetTxTsEntry(struct tx_ts_record *ts) --=20 2.42.0