From nobody Mon Jan 5 11:06:36 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 BD15CE74902 for ; Mon, 2 Oct 2023 17:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238402AbjJBRxS (ORCPT ); Mon, 2 Oct 2023 13:53:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237984AbjJBRxP (ORCPT ); Mon, 2 Oct 2023 13:53:15 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 425D083 for ; Mon, 2 Oct 2023 10:53:12 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9b2c5664cb4so190904066b.1 for ; Mon, 02 Oct 2023 10:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269190; x=1696873990; 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=BFQQ8VYOAr6qNDG5scul8J1mas0KU5lvrUkFm3jfx9c=; b=S7H5BP36OyXRBQ5Rxxyf/KVS0HROdy7TXxhm+dbOjAPTrKq2SlljcJcsPyEaV2UmH9 ymEJ6XTn8Dgy8iHpkvQFA8hXrEAopZuyuhoo4ZnyT2yxdBeC3VyEd8zZBRao0i1fXUWm yb0eSOYhcOPpf9xkyqkVfNR/c62xtnfX5c82PbF806rwxf+Lea0YY/d0I50kz1y1R9w6 9wr6eaLfimwcOYNzW8tXccUI3Ovg71Ybhp5MdITgMntX0ias7c9WB7XklbzLkHzD0av2 xz7FOMsxBP9ca9kNt8sPlFdQeHfqTFt21F9bJT0miPWp7sIYsV7XW4Gdv4RelqK38T5u FO4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269190; x=1696873990; 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=BFQQ8VYOAr6qNDG5scul8J1mas0KU5lvrUkFm3jfx9c=; b=bhtW66D4JdyEcG87kIH04AeGRy69MWlZOh1kTQuG/HnBP8oNGgg2E/seMFZ72ufbbW QpF0H5EHXbIKN5Cf9CSo7dPUe8SH6IVjUiTAI0XryJBcKFXadCcoAkup203nyKCYvgYE 7xZHFCiNcflkEZFPRYvABBLLRTK/nh34V7T7T8gcnNA89JjRTb39obhtw7pnKiHKRZJi GMMA6DhRhAQZpHbCQdfXYvvLbQnX+LfBUCTzXB1Ucf21zyRFzO+ZUxT/X2+otiMfpAR6 tHeYd13Ko5/0JUwfNiOf7oTfG4H4Cllz8D/b6FpbRMteGbObLLk3ru5EoCeWH56yFw59 fusw== X-Gm-Message-State: AOJu0Yx6gc/7nWleyD1+CTBlWKxpsqWwMQuVfIX3U8wHpd/L3jKyMiCh WiA4uFek9ujNiiJtuE6AoXNaQ2iuAaA= X-Google-Smtp-Source: AGHT+IGMa7Qaxlb1KlygBwVlzi54kQa7AeduKFnqNbPLRX9y8enMpw6ICJzR7bnbu6L2qmOZH/0yCQ== X-Received: by 2002:a17:906:25d:b0:9b2:bf2d:6b65 with SMTP id 29-20020a170906025d00b009b2bf2d6b65mr11389311ejl.4.1696269190437; Mon, 02 Oct 2023 10:53:10 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id k5-20020a1709062a4500b009934b1eb577sm17589605eje.77.2023.10.02.10.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:10 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:08 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/8] staging: rtl8192e: Remove unused function rtl92e_dm_backup_state() Message-ID: <104b248b35b4fda560056fc4ab4ac230dea98d3f.1696266964.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" rtl92e_dm_backup_state() is unused. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 19 ------------------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 1 - 2 files changed, 20 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index c29bc85f9577..5217ace3f140 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -973,25 +973,6 @@ static void _rtl92e_dm_bb_initialgain_restore(struct n= et_device *dev) rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1); } =20 -void rtl92e_dm_backup_state(struct net_device *dev) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - u32 bit_mask =3D bMaskByte0; - - priv->bswitch_fsync =3D false; - - if (dm_digtable.dig_algorithm =3D=3D DIG_ALGO_BY_RSSI) - return; - - rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x8); - priv->initgain_backup.xaagccore1 =3D rtl92e_get_bb_reg(dev, rOFDM0_XAAGCC= ore1, bit_mask); - priv->initgain_backup.xbagccore1 =3D rtl92e_get_bb_reg(dev, rOFDM0_XBAGCC= ore1, bit_mask); - priv->initgain_backup.xcagccore1 =3D rtl92e_get_bb_reg(dev, rOFDM0_XCAGCC= ore1, bit_mask); - priv->initgain_backup.xdagccore1 =3D rtl92e_get_bb_reg(dev, rOFDM0_XDAGCC= ore1, bit_mask); - bit_mask =3D bMaskByte2; - priv->initgain_backup.cca =3D (u8)rtl92e_get_bb_reg(dev, rCCK0_CCA, bit_m= ask); -} - static void _rtl92e_dm_dig_init(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index 01587e2fec65..9085a6454cbc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -179,7 +179,6 @@ void rtl92e_dm_txpower_tracking_wq(void *data); void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14); =20 void rtl92e_dm_restore_state(struct net_device *dev); -void rtl92e_dm_backup_state(struct net_device *dev); void rtl92e_dm_init_edca_turbo(struct net_device *dev); void rtl92e_dm_rf_pathcheck_wq(void *data); void rtl92e_dm_init_txpower_tracking(struct net_device *dev); --=20 2.42.0 From nobody Mon Jan 5 11:06:36 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 D8B2EE74903 for ; Mon, 2 Oct 2023 17:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238461AbjJBRx2 (ORCPT ); Mon, 2 Oct 2023 13:53:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238484AbjJBRxX (ORCPT ); Mon, 2 Oct 2023 13:53:23 -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 7F6DBDD for ; Mon, 2 Oct 2023 10:53:18 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9ae3d4c136fso457404866b.1 for ; Mon, 02 Oct 2023 10:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269197; x=1696873997; 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=2MaU5uH1ibxilRt8t8r3fgvnKByywWaocqW4N/d4Gzk=; b=SoxOy1emnlmR6h+G/1RKdiyoGG/2BXnp/xryRjnZBYh2LlS5X0IJPD3MxuVAc/KkSc jljs40wn4+5HTbj9ppB0FVJhFHA052kDeoC3XKMSPJ1nJ5863x79aEv1MOqSaeA8uRFL 7qKxTa50IZAthOa5JP4dqjgqNEfT4P8KofzjdV9HrJb8EmzEY4im0nKlVeRn1uiJ8jU7 VEZe8i8r7qTcSmwwvcyyudBsVECSLCcYFmjNVfYM0sVb42pPG5qjqt31BE8L/nRSAHGZ o5WTL3SQXS6+ybCWBYwbvr9qntX058CAyhEBzBm0oi8ErlkDYf/eaGid5K9milDFd9BC jb8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269197; x=1696873997; 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=2MaU5uH1ibxilRt8t8r3fgvnKByywWaocqW4N/d4Gzk=; b=Ntwxex3p9WEdg0Qe4j7D6Zi0ZR/GKJOHOkFhK9kVFguDs+3lJxF0TQNG4S9cWT5xEH sK74uBXw3Eo1qn6JTTwnUYrxZmL7XLXKLCLfI9btIPbn0Txl8fgNpOVUpSDGnigO96Dk ToLXc0DEeYck0UDRA76XTcds1chmW//tzCXcrO172FoS27sKh3b5N3teIsFxSdvNu0FT 1lIo7BV2v8qnQh6rzFbb3486KHCBFAd97WTGV6uytK+TOz1srpiqkZmI+1GeCMQlRzen LCuczoA6ErhGIqKq7jhPspElFJLY0t3c8lIDZay8dS8WufDjEUFkL0kMexdTygsLplg/ ywsQ== X-Gm-Message-State: AOJu0Yzjm+J7MUt1Tk3O4ackDDF4rV14cN65RkDLkxKuPMWrgOo3IQNP Uq5r2c3S6Wqs2wIuoighcWs= X-Google-Smtp-Source: AGHT+IElZXi/rxyi2s/Mir1JaEEMtjtCsyT10UzRXdO6LgYTAhGKUql4RrYmRq8A6fUBMu4KSMxyqw== X-Received: by 2002:a17:906:25d:b0:9ae:6552:4af6 with SMTP id 29-20020a170906025d00b009ae65524af6mr10156736ejl.1.1696269196905; Mon, 02 Oct 2023 10:53:16 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id i8-20020a17090685c800b009ad7fc17b2asm17457685ejy.224.2023.10.02.10.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:16 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:15 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] staging: rtl8192e: Remove unused function rtl92e_dm_restore_state() 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 rtl92e_dm_restore_state() as it is unused. Remove called functions _rtl92e_dm_tx_power_reset_recovery() and _rtl92e_dm_bb_initialgain_restore() as well. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 59 ---------------------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 1 - 2 files changed, 60 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 5217ace3f140..8f5e4b932350 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -161,7 +161,6 @@ static void _rtl92e_dm_bandwidth_autoswitch(struct net_= device *dev); =20 static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev); =20 -static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev); static void _rtl92e_dm_dig_init(struct net_device *dev); static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev); static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev= ); @@ -915,64 +914,6 @@ void rtl92e_dm_cck_txpower_adjust(struct net_device *d= ev, bool binch14) _rtl92e_dm_cck_tx_power_adjust_thermal_meter(dev, binch14); } =20 -static void _rtl92e_dm_tx_power_reset_recovery(struct net_device *dev) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - - rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, - dm_tx_bb_gain[priv->rfa_txpowertrackingindex]); - rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); - - rtl92e_set_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, - dm_tx_bb_gain[priv->rfc_txpowertrackingindex]); -} - -void rtl92e_dm_restore_state(struct net_device *dev) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - u32 reg_ratr =3D priv->rate_adaptive.last_ratr; - u32 ratr_value; - - if (!priv->up) - return; - - if (priv->rate_adaptive.rate_adaptive_disabled) - return; - if (priv->rtllib->mode !=3D WIRELESS_MODE_N_24G) - return; - ratr_value =3D reg_ratr; - ratr_value &=3D ~(RATE_ALL_OFDM_2SS); - rtl92e_writel(dev, RATR0, ratr_value); - rtl92e_writeb(dev, UFWP, 1); - if (priv->tx_pwr_tracking_init && priv->btxpower_tracking) - _rtl92e_dm_tx_power_reset_recovery(dev); - - _rtl92e_dm_bb_initialgain_restore(dev); -} - -static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - u32 bit_mask =3D 0x7f; - - if (dm_digtable.dig_algorithm =3D=3D DIG_ALGO_BY_RSSI) - return; - - rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x8); - rtl92e_set_bb_reg(dev, rOFDM0_XAAGCCore1, bit_mask, - (u32)priv->initgain_backup.xaagccore1); - rtl92e_set_bb_reg(dev, rOFDM0_XBAGCCore1, bit_mask, - (u32)priv->initgain_backup.xbagccore1); - rtl92e_set_bb_reg(dev, rOFDM0_XCAGCCore1, bit_mask, - (u32)priv->initgain_backup.xcagccore1); - rtl92e_set_bb_reg(dev, rOFDM0_XDAGCCore1, bit_mask, - (u32)priv->initgain_backup.xdagccore1); - bit_mask =3D bMaskByte2; - rtl92e_set_bb_reg(dev, rCCK0_CCA, bit_mask, - (u32)priv->initgain_backup.cca); - rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1); -} - static void _rtl92e_dm_dig_init(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index 9085a6454cbc..5ae2bf467158 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -178,7 +178,6 @@ void rtl92e_dm_txpower_tracking_wq(void *data); =20 void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14); =20 -void rtl92e_dm_restore_state(struct net_device *dev); void rtl92e_dm_init_edca_turbo(struct net_device *dev); void rtl92e_dm_rf_pathcheck_wq(void *data); void rtl92e_dm_init_txpower_tracking(struct net_device *dev); --=20 2.42.0 From nobody Mon Jan 5 11:06:36 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 CB303E74902 for ; Mon, 2 Oct 2023 17:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238615AbjJBRxa (ORCPT ); Mon, 2 Oct 2023 13:53:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238617AbjJBRx1 (ORCPT ); Mon, 2 Oct 2023 13:53:27 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E3FFC4 for ; Mon, 2 Oct 2023 10:53:24 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9ae65c0e46fso488198066b.0 for ; Mon, 02 Oct 2023 10:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269203; x=1696874003; 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=VI395aHYezAAbuS4rsTYZYM/myZs8mb+8AgHT/E9XGc=; b=Md2ebepqrXKtJYWXyzPseYWeJHVSBM7Oy/5oA8hg17AEb3ECJO/CJjQiO676hIV69I JcRpi12lErjJp57GBDnDjnmVh6sVx2WnkmajFV6/M5pmv1qcmll1I2Y8TYn7ouymVJ8K C/s+ocPWtBp42HTbiBmrtP8dj4GSdWipg83d9OwxunpADDD5ujS72e9akMvG1mr0/LDf bkI3h6CD70LpNqD23qA60jp6LaM5l4FHypdtn4hdCky2TYdQ9u28FWB9wYSey5XWlpai AhSelo+SuODBs21UUauN4bJ6oDagwkFm89Fafs/ORkOvbdghs7F9A/KF7tANkpXpAerd Fv6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269203; x=1696874003; 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=VI395aHYezAAbuS4rsTYZYM/myZs8mb+8AgHT/E9XGc=; b=jXJfrF9Y3GqTugSPeXVimOJ69Wrf5bz1ujjzMgo18zvVBh3j5z2CkzFFGRKwvhQ9Zd NZHx0B172IoWNFLm2TQyJulTJwa7bAHUrwvK4ImZyjcViDzuC3CWiRM2uB7flIpOeHg2 HrGVEFLrMd7pZ6ddfQIX4db/abn2PqOMI2KuU7V2gQbBTcOetbE+yhfLGAbcVwRPw7H4 mAFhX5m0ha0y/m2dymimid0o1Nrg7xsZ8i328MnDTOq2j8y9jnbUGM3EEUWd3yX1R0Ix VqVp/8ojz+KL/haffQiywv1t2+/3/zvLWtTKyCDtDQCPuHO2E6aTwgfK57DfON2xd9IN YUKA== X-Gm-Message-State: AOJu0YwZCm2FmXXTk4Rgo4VERITjD+jKaBg1all4UX9/XLT5uW3FShr+ Fxz4BtzDKAZ5qYRkT5d1TBg= X-Google-Smtp-Source: AGHT+IEl/lVkCLAPFxOzKUeloban6aKu5e6isDsY2DdbnoFz+c28BYtHiO0zeXm1LstVsjSB03+6Pg== X-Received: by 2002:a17:906:104e:b0:9b2:bf2d:6b66 with SMTP id j14-20020a170906104e00b009b2bf2d6b66mr9954680ejj.7.1696269202530; Mon, 02 Oct 2023 10:53:22 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id dt18-20020a170906b79200b0099bcf9c2ec6sm17247780ejb.75.2023.10.02.10.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:22 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:20 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/8] staging: rtl8192e: Remove unused function rtl92e_cam_restore() Message-ID: <4375f7909fe717555adca1338506fb6d4dad142e.1696266964.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" rtl92e_cam_restore() is unused. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 63 --------------------- drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 1 - 2 files changed, 64 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 14b48cacfbbd..9b280cee0ac1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -121,66 +121,3 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo= , u8 KeyIndex, } } } - -void rtl92e_cam_restore(struct net_device *dev) -{ - u8 EntryId =3D 0; - struct r8192_priv *priv =3D rtllib_priv(dev); - u8 *MacAddr =3D priv->rtllib->current_network.bssid; - - static u8 CAM_CONST_ADDR[4][6] =3D { - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x01}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x02}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x03} - }; - static u8 CAM_CONST_BROAD[] =3D { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - }; - - if ((priv->rtllib->pairwise_key_type =3D=3D KEY_TYPE_WEP40) || - (priv->rtllib->pairwise_key_type =3D=3D KEY_TYPE_WEP104)) { - for (EntryId =3D 0; EntryId < 4; EntryId++) { - MacAddr =3D CAM_CONST_ADDR[EntryId]; - if (priv->rtllib->swcamtable[EntryId].bused) { - rtl92e_set_key(dev, EntryId, EntryId, - priv->rtllib->pairwise_key_type, - MacAddr, 0, - (u32 *)(&priv->rtllib->swcamtable - [EntryId].key_buf[0])); - } - } - - } else if (priv->rtllib->pairwise_key_type =3D=3D KEY_TYPE_TKIP) { - rtl92e_set_key(dev, 4, 0, - priv->rtllib->pairwise_key_type, - MacAddr, 0, - (u32 *)(&priv->rtllib->swcamtable[4].key_buf[0])); - } else if (priv->rtllib->pairwise_key_type =3D=3D KEY_TYPE_CCMP) { - rtl92e_set_key(dev, 4, 0, - priv->rtllib->pairwise_key_type, MacAddr, - 0, (u32 *)(&priv->rtllib->swcamtable[4].key_buf[0])); - } - - if (priv->rtllib->group_key_type =3D=3D KEY_TYPE_TKIP) { - MacAddr =3D CAM_CONST_BROAD; - for (EntryId =3D 1; EntryId < 4; EntryId++) { - if (priv->rtllib->swcamtable[EntryId].bused) { - rtl92e_set_key(dev, EntryId, EntryId, - priv->rtllib->group_key_type, - MacAddr, 0, - (u32 *)(&priv->rtllib->swcamtable[EntryId].key_buf[0])); - } - } - } else if (priv->rtllib->group_key_type =3D=3D KEY_TYPE_CCMP) { - MacAddr =3D CAM_CONST_BROAD; - for (EntryId =3D 1; EntryId < 4; EntryId++) { - if (priv->rtllib->swcamtable[EntryId].bused) { - rtl92e_set_key(dev, EntryId, EntryId, - priv->rtllib->group_key_type, - MacAddr, 0, - (u32 *)(&priv->rtllib->swcamtable[EntryId].key_buf[0])); - } - } - } -} diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.h index bd33ef105107..615b84bca9b8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h @@ -20,6 +20,5 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u= 8 KeyIndex, u32 *KeyContent); void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, const u8 *MacAddr, u32 *KeyContent); -void rtl92e_cam_restore(struct net_device *dev); =20 #endif --=20 2.42.0 From nobody Mon Jan 5 11:06:36 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 35B34E74902 for ; Mon, 2 Oct 2023 17:53:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238648AbjJBRxh (ORCPT ); Mon, 2 Oct 2023 13:53:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238650AbjJBRxd (ORCPT ); Mon, 2 Oct 2023 13:53:33 -0400 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 E89C1F2 for ; Mon, 2 Oct 2023 10:53:29 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-53636bc91a8so1134454a12.1 for ; Mon, 02 Oct 2023 10:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269208; x=1696874008; 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=Ayat5KM/WUkPq1z1BDmKsHr3rXeO84/wlnct3+KjBfI=; b=iJalnKRjlujpgDH4Q7pZ6TW6hxyhu7cVlVEu7Rb6XgbMbmzT+ZJP+9Wja/2/AWq//L GweeCfNXeYZF4stNsF9lx3uWTW7SPUyzS2gRf3CC64l7P2X5A30FgW1TXvVHDFtQcLeq 8Fi5GHHiB3+h1ARPr8m1L70kbLXTKMgzUtChYNwjbO2jNYeyBdFzAWOAg/M3Ndni7804 sQ2GSW4jdhE3UuqvDy+5Jk/5LEvohR78SQw8cifYW8Eylwn4k7sVOhccDTKeBpPST6Dh NLZf9Yd2NGL8VPPcAzB2x0RXTSOmsP4vd9GCFYewgVQfSbayyXtvUJilRFtdMIMYnJRp L5Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269208; x=1696874008; 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=Ayat5KM/WUkPq1z1BDmKsHr3rXeO84/wlnct3+KjBfI=; b=WxSUDH9FFy/onfjFFMn8RhIQYXEwDzAsurgWdk7OkMMxwY+XB4fG+lct1YtdbIKlyo xwZPtH6sblfD97/IaorD/xxL8zJPXPLRA/Vv5eqBwFuFtOpEyOfmeL6fZe7CYqcwy1QZ VkLgNBFYCwMdDEsCAJHwAJg98z4mU2nYhe00O9LGAQuEsTcZ5fvFD2mOaISJhVfXA/g9 8t8jlLf1oVAW4olwkm6IQveS+F/jXyhCAlPQQAeTkbXeRptM6NrFDdyKZHUHN4vdwSS/ v9w4DQK5p8Kl+pdEkaStpUxwF2xhHi2sjGAO1fxR7gA+OEMobXBH8vt090hgq5OP8p6A GiMA== X-Gm-Message-State: AOJu0Yx6YvVcdoaVnQo6iiFzI8ZUGdRNrNieYjN+pXbMfP2kLQ4JLO/3 x1oZRagqws38IzJ1c6n612AHeeF5Lok= X-Google-Smtp-Source: AGHT+IHpvTp7tKTXmSCrAZb8YRarfK4mYBGN+W44cmYxXmWEVHLEPVh7MTKNbTs8Te2KMHTQmlpaIw== X-Received: by 2002:a17:906:74d4:b0:9b2:b149:b816 with SMTP id z20-20020a17090674d400b009b2b149b816mr9417257ejl.7.1696269208425; Mon, 02 Oct 2023 10:53:28 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id qk8-20020a170906d9c800b009a1dbf55665sm17183634ejb.161.2023.10.02.10.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:28 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:26 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] staging: rtl8192e: Remove unused variable last_ratr Message-ID: <2b91a8f4ec6184c2f16b8f65bdf65c69a4d17458.1696266964.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" last_ratr is written but never evaluated. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 -- drivers/staging/rtl8192e/rtllib.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 8f5e4b932350..52b9393b55e7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -370,8 +370,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_d= evice *dev) ratr_value &=3D ~(RATE_ALL_OFDM_2SS); rtl92e_writel(dev, RATR0, ratr_value); rtl92e_writeb(dev, UFWP, 1); - - pra->last_ratr =3D target_ratr; } =20 } else { diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 004818520ea8..1e474691aa88 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1164,7 +1164,6 @@ struct rate_adaptive { u8 ping_rssi_enable; u32 ping_rssi_ratr; u32 ping_rssi_thresh_for_ra; - u32 last_ratr; u8 PreRATRState; =20 }; --=20 2.42.0 From nobody Mon Jan 5 11:06:36 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 A7239E74902 for ; Mon, 2 Oct 2023 17:53:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238628AbjJBRxp (ORCPT ); Mon, 2 Oct 2023 13:53:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238620AbjJBRxj (ORCPT ); Mon, 2 Oct 2023 13:53:39 -0400 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 164C4C9 for ; Mon, 2 Oct 2023 10:53:36 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9ae65c0e46fso488204766b.0 for ; Mon, 02 Oct 2023 10:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269214; x=1696874014; 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=v8XgAodUCp0kY+1km3TbFUFkWPyDPdSc7jRGFUGZ6tY=; b=Td9DXcCrx0CpY0PtA3NkWlnOh79juT4XgF5jJDBpw25kC8c4grt/1HNnMrBVrt2aYY LptVU2NIdiAE2ZG3rnO23Q0TVqw9rQNza04xUu/8UE192QvyKysdOe6eYDIRORAnMhKx IfiDPF8tNSBT6BQAKLiaM58y/N2HU+2dFcz6ZAyfiIdFyN7Qn0g9e3JLPFgMQ1Ba4GNx kiP/0uLWSarSJoOwYPq57wLq03InZW5ryWZXnie2qzclKR4jRljhE2PzOapyhaeaGE19 zADuJ9tZySuIXZTUF6HbwyYjHKxVxlsZQ1GNq4NLC0li6fRRCjVzswbpQZHPCXdwlGw1 z9gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269214; x=1696874014; 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=v8XgAodUCp0kY+1km3TbFUFkWPyDPdSc7jRGFUGZ6tY=; b=mpiTRLfqgqU8xdnz2X7Ac+BxZ2pYjQ495UrTj+tQPHfZdrtdV0ThYjSrbjI2G2RhNR 3USRQv7EZUFqSGeMiFYB65jfgQQHS8X4e4SNS4rWpc1YxZuIuXjU2PiT2vzPAfzuj0w8 Q8zcNAa8V291+qzN9e9tHV60yHYYmyqitQAY7qHNkb2YC65R2nqPBm4qKyirc/jpfsGG owwAU5ZPh0GNUlCL3Q3QDOoUllJhVCalI32pz/YoLoyD6BJ67VpPyVOe4f6SIJSb7+Mc XxOXnuKKc0fSsd8cfdK2sdS30mfuGLi83IRE0K6vx3a2BC6m1jWng5fbAnhGdHoejahJ QBIw== X-Gm-Message-State: AOJu0YzkyCuP7Z89Mw4r9Q0DgHVtOfRC7kwKr3Ntj8DAjnukF+5oFz00 Q8rbMnaQIItLOpgB89M9BQw= X-Google-Smtp-Source: AGHT+IHxoVyWegDAD4XwJ303ZcTwEtX/l/Xbey9YjC2IN7R8/Q0amJdtjx2O+QvFQl7248scBmVivg== X-Received: by 2002:a17:906:7389:b0:9b2:71f2:bd11 with SMTP id f9-20020a170906738900b009b271f2bd11mr9471541ejl.4.1696269214420; Mon, 02 Oct 2023 10:53:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id k20-20020a170906681400b009adca8ada31sm17651321ejr.12.2023.10.02.10.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:34 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:32 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] staging: rtl8192e: Remove unused variable rate_adaptive_disabled Message-ID: <31ba05bce9966dfac15cac15aa0e79cf36fad27f.1696266964.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" rate_adaptive_disabled is initialized to 0 and unchanged. The equation results accordingly. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 3 --- drivers/staging/rtl8192e/rtllib.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 52b9393b55e7..01abe1e48468 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -284,9 +284,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_d= evice *dev) if (!priv->up) return; =20 - if (pra->rate_adaptive_disabled) - return; - if (priv->rtllib->mode !=3D WIRELESS_MODE_N_24G) return; =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 1e474691aa88..bf4ec38efa35 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1146,7 +1146,6 @@ struct sw_cam_table { =20 #define TOTAL_CAM_ENTRY 32 struct rate_adaptive { - u8 rate_adaptive_disabled; u8 ratr_state; u16 reserve; =20 --=20 2.42.0 From nobody Mon Jan 5 11:06:36 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 A3D4DE74902 for ; Mon, 2 Oct 2023 17:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238430AbjJBRxv (ORCPT ); Mon, 2 Oct 2023 13:53:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238607AbjJBRxr (ORCPT ); Mon, 2 Oct 2023 13:53:47 -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 52B8BE3 for ; Mon, 2 Oct 2023 10:53:42 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-523029050d0so4188163a12.0 for ; Mon, 02 Oct 2023 10:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269220; x=1696874020; 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=qji/asc5BFgCecowyKzRvOvxJoUOq3ag30EUXlyRUKs=; b=WB1A3lKHbsWAToLvQKhJtUowmzIqkCpmswIISA/5Akx/N7ZJF4WrrVLXXEFn+xpVof 9uLg8GTZLj6lrwJjS/UXPZ4Luf93stZllt7amlPPoqvz7ih33dDkYexdHF81T19jz3Rv aAn3vW0e8PGVvTGn4GVL5qyL5/49CnxF6VphTWg1Q4LQzsRaK+ItsnP4pej6c67G8i6s xe2r5Ymq5zh52Em/8bXd94INMcJSkfGvAMW1KRxAwZpJ/ozAI4iORJ9rOZd44YtJyadF 1iOAjBNP4djmsO+qGhqf089RRVP9bIqNyaSY5Q0VTaGnQ74MjUlubXiYSFK8c2mGs4fq ZOHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269220; x=1696874020; 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=qji/asc5BFgCecowyKzRvOvxJoUOq3ag30EUXlyRUKs=; b=OmAVaZb4IJhFFlakieb+axCuBmhRnPceWy5s2XW4BAyfMe0gFS7FUxQRrdUO1+u9Rn R5tvRlaNLEM4NkK5vow3UJWEY/9Ft2vbzW4l41Wr0A0HkhBc5uPCBMpgbAIu1TwKOi9r z2M/zHt23L9oJueKTQs6gueZE0YMZkfLDtRMhjWT/M+5QNA8swXu+d72kt8NwqujPhB6 3qOEIZZEKn5mP4zg64bEexQ2RjP/orvPQk9YXrld1CilTiQ69L/NfFj2SSO8utj91TWZ rpx5WgPl62g3k7YoYVUu+Vmb3mgGKnSiPKBTMyedOb/2zkMVFMpO8CrITMuubdlUnKLN EVFQ== X-Gm-Message-State: AOJu0Yy50LsBgk+XS7XH2ysRrcPOTlZm6N2X4N2VTdBW3JQyAVSldLau cQsaEHjCLqKcHyyCaEkVzvYqNYghhEQ= X-Google-Smtp-Source: AGHT+IFByP88id4SK3YuKR3PUATH7q6MIR68JqtgsgQiF8X0mqXbh27Oq3G+tLIZ8mrYaBWZTQ8jmw== X-Received: by 2002:a05:6402:2802:b0:523:37cf:6f37 with SMTP id h2-20020a056402280200b0052337cf6f37mr12123619ede.4.1696269220639; Mon, 02 Oct 2023 10:53:40 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id es9-20020a056402380900b00536275c28dbsm6886221edb.94.2023.10.02.10.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:40 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:38 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/8] staging: rtl8192e: Remove unused variable rfc_txpowertrackingindex Message-ID: <20a1f7b8297e93e2f0e593f3ddd772ff10d1fecb.1696266965.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" rfc_txpowertrackingindex is initialized to 0 and unchanged. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index c4688c273f4b..1f3a2bee247f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -752,7 +752,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->bcck_in_ch14 =3D false; priv->cck_present_attn =3D 0; priv->rfa_txpowertrackingindex =3D 0; - priv->rfc_txpowertrackingindex =3D 0; priv->cck_pwr_enl =3D 6; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); priv->rx_ctr =3D 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index deb707dfa443..922231274f4b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -344,7 +344,6 @@ struct r8192_priv { u8 rfa_txpowertrackingindex; u8 rfa_txpowertrackingindex_real; u8 rfa_txpowertracking_default; - u8 rfc_txpowertrackingindex; bool btxpower_tracking; bool bcck_in_ch14; =20 --=20 2.42.0 From nobody Mon Jan 5 11:06:36 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 1B8F4E74902 for ; Mon, 2 Oct 2023 17:53:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238658AbjJBRx4 (ORCPT ); Mon, 2 Oct 2023 13:53:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238474AbjJBRxy (ORCPT ); Mon, 2 Oct 2023 13:53:54 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4983E5 for ; Mon, 2 Oct 2023 10:53:49 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-52f1ece3a76so4651367a12.0 for ; Mon, 02 Oct 2023 10:53:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269228; x=1696874028; 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=YIcOLQi7rOEZO2zRfMF5D3C/NLGqqczvIFQ3scs6Ros=; b=JKBrDt01TuJEWKw0o6jrq3sOEtBd5lgHp4sFHg9gIPIHA2qiIG6NB6BrQ0D9uMnwqu SITsTeJ5PD2dMWNIYmdzKDNY0YxdOzfeez1sjzPa5dv76FtH5qRbfPgO6sqSM/8hynku BVM6kx6EgiF8YNxZ2GtfE1KUNjOZYrJ2aAXxU2TLg2GVH86WXQu6ARhLmOAhBwUsRkL/ JTCjUlTNU586A0u/aFIAqpsPHOH664LRJoSyHidXoHhdqtazgHqR+8YColiNPL1S1bqZ TGnvH8TG8IaBqGvSxR45Pg8naQIdWYtTzeB+UhrxH1CpUI1hR/vyfzHIsl0zkLFrmzgF c3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269228; x=1696874028; 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=YIcOLQi7rOEZO2zRfMF5D3C/NLGqqczvIFQ3scs6Ros=; b=QcHVWBUdvAmUONbUg1pSejeCNU/Poy5KGVYhlWeAmaNKCl8rigoUNGgaG5XLOLp4q3 kgOszQNauYV49ZyHfL1gPH0GfOsd0erJMsU235gIN/6h22pPeCveSZCB+70be/tuBULW 0tuYG0LL0a2XLQW9/ITjOUPED+zqRPwreHVWi/RyVabHcGHFvo/zss2oTDIvt4us980H 5QhtReWhjQvO2UJ46N2XIDPJnJfur0PMW4tJeZ8G5Xe2P9X5yQKlNhVhQizoRxispf1h z9PWaGBY62db79SFZo70Nvwr+OEwh0UNjzv3IDdJW9vwj7WfgAjg7BGH0d03FsZpHOeZ pYdA== X-Gm-Message-State: AOJu0YwbgjstbtCaanSBeK40xSkn1viiYjFLBcxByxuYICFjoO0JPhaD +styjoxJUZLdayBSWN+fSK8= X-Google-Smtp-Source: AGHT+IFiIdAwKQO22SOdobp677I3ry+U9Ko94xzyH8SLb9QIjxzjD2SHLIyvLGR1CzUtGqCLzS1OZw== X-Received: by 2002:a05:6402:2792:b0:51a:4d46:4026 with SMTP id b18-20020a056402279200b0051a4d464026mr9627644ede.0.1696269227733; Mon, 02 Oct 2023 10:53:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id e6-20020a056402104600b00536e03f62bcsm5772882edu.59.2023.10.02.10.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:47 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:45 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] staging: rtl8192e: Remove unused/constant parameter mesh_flag and shutdown Message-ID: <5a8f87165b10fd93e3e2fad83ff3380c9f4f22b2.1696266965.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 parameters mesh_flag and shutdown of function rtllib_softmac_stop_protocol(). mesh_flag is unused. shutdown is always true. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 3 +-- drivers/staging/rtl8192e/rtllib_softmac.c | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 1f3a2bee247f..4e9a0138ce55 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -655,7 +655,7 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) _rtl92e_cancel_deferred_work(priv); cancel_delayed_work(&priv->rtllib->hw_wakeup_wq); =20 - rtllib_softmac_stop_protocol(priv->rtllib, 0, true); + rtllib_softmac_stop_protocol(priv->rtllib); spin_lock_irqsave(&priv->rf_ps_lock, flags); while (priv->rf_change_in_progress) { spin_unlock_irqrestore(&priv->rf_ps_lock, flags); @@ -1763,7 +1763,7 @@ void rtl92e_commit(struct net_device *dev) =20 if (priv->up =3D=3D 0) return; - rtllib_softmac_stop_protocol(priv->rtllib, 0, true); + rtllib_softmac_stop_protocol(priv->rtllib); rtl92e_irq_disable(dev); rtl92e_stop_adapter(dev, true); _rtl92e_up(dev); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index bf4ec38efa35..65f29afa81be 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1705,8 +1705,7 @@ void rtllib_DisableNetMonitorMode(struct net_device *= dev, bool bInitState); void rtllib_EnableIntelPromiscuousMode(struct net_device *dev, bool bInitS= tate); void rtllib_DisableIntelPromiscuousMode(struct net_device *dev, bool bInitState); -void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, - u8 mesh_flag, u8 shutdown); +void rtllib_softmac_stop_protocol(struct rtllib_device *ieee); void rtllib_softmac_start_protocol(struct rtllib_device *ieee, u8 mesh_fla= g); =20 void rtllib_reset_queue(struct rtllib_device *ieee); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 777338fd2664..1a086f0ff10d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2279,12 +2279,11 @@ struct sk_buff *rtllib_get_beacon(struct rtllib_dev= ice *ieee) } EXPORT_SYMBOL(rtllib_get_beacon); =20 -void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, u8 mesh_flag, - u8 shutdown) +void rtllib_softmac_stop_protocol(struct rtllib_device *ieee) { rtllib_stop_scan_syncro(ieee); mutex_lock(&ieee->wx_mutex); - rtllib_stop_protocol(ieee, shutdown); + rtllib_stop_protocol(ieee, true); mutex_unlock(&ieee->wx_mutex); } EXPORT_SYMBOL(rtllib_softmac_stop_protocol); --=20 2.42.0 From nobody Mon Jan 5 11:06:36 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 C79E3E74902 for ; Mon, 2 Oct 2023 17:54:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237373AbjJBRyG (ORCPT ); Mon, 2 Oct 2023 13:54:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238607AbjJBRyE (ORCPT ); Mon, 2 Oct 2023 13:54:04 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E97CE4 for ; Mon, 2 Oct 2023 10:54:00 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3233799e7b8so14439f8f.0 for ; Mon, 02 Oct 2023 10:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269239; x=1696874039; 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=76iRx49ZBjTzS3/ihrdEmUB6JBE+9sFOl4sgt+UhoLQ=; b=lAmREfscTE1emigtGjrRuaD8nRXe6x6R6JZEvedk7T9aFv1qZIQokQkjgD3rf2jpwE BdSCRN61lEusLOy1AVPGw/yUN0w/aYqZuulUcJtX8VSjdaeKs/LaDdxnCnzNHdWbt0z1 HUpnjtE8iQoQOud11QhELFP4IiRhMhVnnzpKPpd8YtwBa4/6seSd+xCy28kF2Kf9VqNh OIH3/DoAiZ3Mxg+z/JZF4ojGSHSXDHnJdJewa0JTnmwObHwR7G6YDDcfDeiNAL4Qmqhv dUpFBhXcjIOpb9ZlFkdDrmyF3D9YYU/DFC/XNMlCKcM+ndzmFIjmIFSNa8TNK6VPQiIL E9kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269239; x=1696874039; 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=76iRx49ZBjTzS3/ihrdEmUB6JBE+9sFOl4sgt+UhoLQ=; b=iYP6rmy525RYMPEZX75Yj/1sAy7TfA4iGMFyb3goqEOyRFgGjuilF8vHEqsOUtjQmS 9Msmtnws132fUQEomX8Ka3aQjMXd+VA+7hIKQXPifqDiylyIyMejECfc68R55Aaoelx6 KO86PiK5J8L8j/ZGrgI0NVyfHR5B0txac1I+IrJNEbiOj/9cxHigUjVp/qoDJECmzQ7v Lh/sXeCLTYzip5175OwVw6TK0SqEfwQ97CL87jfpnXi9TbCdwl2vnqq5QabnJV8cNaxT c8XfpH+RIqhPjqrNapzxjICSZCUZ22HB6Akda0eRXZ5eal2tTQ+pMtGr20Jv0PmvJLFB 0OBQ== X-Gm-Message-State: AOJu0YxEb3vDb3ZtRXSM7P9nkH30aykcnpFBmh2/TbHFE8AL6U6sKIbi GjvX3RGPvZzpPqS/89BdLoY= X-Google-Smtp-Source: AGHT+IEqGg5Mv/6tMKOZxA4ggAtVSs5nKOTnduDKRqzJPyS9+sVH5HpcAbGEOT/LL84pTdI3LN+dYA== X-Received: by 2002:adf:f04b:0:b0:317:630d:1e8e with SMTP id t11-20020adff04b000000b00317630d1e8emr10079014wro.2.1696269238704; Mon, 02 Oct 2023 10:53:58 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id z19-20020a1709063ad300b009a1a653770bsm17455916ejd.87.2023.10.02.10.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:58 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:56 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] staging: rtl8192e: Remove constant parameter from rtllib_stop_protocol() Message-ID: <7eebcd3a8637b686331e34532136df3e7760f869.1696266965.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 constant parameter shutdown of function rtllib_stop_protocol(). shutdown is always true. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 19 ++++++++----------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +++--- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 65f29afa81be..ff1728d1824d 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1698,7 +1698,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *i= eee); void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr); void rtllib_sta_ps_send_pspoll_frame(struct rtllib_device *ieee); void rtllib_start_protocol(struct rtllib_device *ieee); -void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown); +void rtllib_stop_protocol(struct rtllib_device *ieee); =20 void rtllib_EnableNetMonitorMode(struct net_device *dev, bool bInitState); void rtllib_DisableNetMonitorMode(struct net_device *dev, bool bInitState); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 1a086f0ff10d..79a62bd9a297 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2283,21 +2283,19 @@ void rtllib_softmac_stop_protocol(struct rtllib_dev= ice *ieee) { rtllib_stop_scan_syncro(ieee); mutex_lock(&ieee->wx_mutex); - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); mutex_unlock(&ieee->wx_mutex); } EXPORT_SYMBOL(rtllib_softmac_stop_protocol); =20 -void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) +void rtllib_stop_protocol(struct rtllib_device *ieee) { if (!ieee->proto_started) return; =20 - if (shutdown) { - ieee->proto_started =3D 0; - ieee->proto_stoppping =3D 1; - ieee->rtllib_ips_leave(ieee->dev); - } + ieee->proto_started =3D 0; + ieee->proto_stoppping =3D 1; + ieee->rtllib_ips_leave(ieee->dev); =20 del_timer_sync(&ieee->associate_timer); mutex_unlock(&ieee->wx_mutex); @@ -2315,10 +2313,9 @@ void rtllib_stop_protocol(struct rtllib_device *ieee= , u8 shutdown) rtllib_disassociate(ieee); } =20 - if (shutdown) { - RemoveAllTS(ieee); - ieee->proto_stoppping =3D 0; - } + RemoveAllTS(ieee); + ieee->proto_stoppping =3D 0; + kfree(ieee->assocreq_ies); ieee->assocreq_ies =3D NULL; ieee->assocreq_ies_len =3D 0; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 3c7c0f07ab0b..e9da566646c5 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -134,7 +134,7 @@ int rtllib_wx_set_wap(struct rtllib_device *ieee, } =20 if (ifup) - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); =20 /* just to avoid to give inconsistent infos in the * get wx method. not really needed otherwise @@ -277,7 +277,7 @@ int rtllib_wx_set_mode(struct rtllib_device *ieee, stru= ct iw_request_info *a, if (!ieee->proto_started) { ieee->iw_mode =3D wrqu->mode; } else { - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); ieee->iw_mode =3D wrqu->mode; rtllib_start_protocol(ieee); } @@ -401,7 +401,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, } =20 if (proto_started) - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); =20 /* this is just to be sure that the GET wx callback * has consistent infos. not needed otherwise --=20 2.42.0