From nobody Wed Jan 7 03:30:18 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 4EC06E748F7 for ; Sun, 1 Oct 2023 13:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235017AbjJANoH (ORCPT ); Sun, 1 Oct 2023 09:44:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231969AbjJANoG (ORCPT ); Sun, 1 Oct 2023 09:44:06 -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 913A1B0 for ; Sun, 1 Oct 2023 06:44:02 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-523029050d0so3835532a12.0 for ; Sun, 01 Oct 2023 06:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167841; x=1696772641; 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=tpJqPIVcZcjgtPzZR6Y1+bljvbB1Yn2y5DRCpOzZBaw=; b=iTQ5YB3sdeKxQhtEGCLDmo8/6kHs3kQi47YYSmGrWB2BO+6+ORqAVNMuAxNjhbFUcZ JOrqvLq86J8ht2t3rGOOpf9MPvQRcOW1n/PM6ZOTxQV64GjgRgzYxt5kQG45sgDw6qfT WI+eiJNZkaVvpsP+K6ZPX882IYKU+7oKLgtCqof1E1apWdrUerNeLVueNFNpkiLvF1mm Xo5hNgkViXEOUENsXVFqn2jJPDNqsNUlw8NE7BCplnSw24vkmDlAb7z4RgVJGPwuCo0e +OWo5O6gN55Qg0S2MvEUx0QDD6xvi7ctlJu98NihCrVAa9PiGxWu9+xzMXuDeqVNqzHc 1xYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167841; x=1696772641; 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=tpJqPIVcZcjgtPzZR6Y1+bljvbB1Yn2y5DRCpOzZBaw=; b=M1ti0ezW26+wWrVKUiRTAPZsSyxURMoztPsFxLlWflmuwQTBl7FbOhN8K52nbq1mmN pUShanWI12H+1Eb4NVVoJYONvVh3QK7RgjqzDdJdYUQt+58ypR38dBSP3r3ICNmCY/FE Ym0Ha728B8zqfiry2LSANW1baKxwSoIJ6Pauo7oaVMtUyj4D23mWH26RKokVILCnhARj iQ7npxjCdrQoo55v6eg1AuGDbfoBD65YQ6vxMZyLZ8hBBlPOgJLLApCNE4BPCazldUPH vAxuq7xUazpgjCE7FWUHXaDEtN/5D2klKMlNM1hmINKHqBxgOFxITWBbETvr+ThBCR+q d4SA== X-Gm-Message-State: AOJu0YxArfsPqcxu7K8J3GhNp6t3VjsDGJbzg1JH5ezhIyElWScpr4Bl eit37biuYLSr1i6x/O50iJ8= X-Google-Smtp-Source: AGHT+IF5OXRGF43i9gacuTZV4oRdQf2af9FFA391ivlSZkh5dYNLjj+RmPxYqv/6QsIHztrK8uwkdw== X-Received: by 2002:a05:6402:2790:b0:52f:bedf:8ef1 with SMTP id b16-20020a056402279000b0052fbedf8ef1mr8458721ede.3.1696167841055; Sun, 01 Oct 2023 06:44:01 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id d15-20020aa7d68f000000b005333922efb0sm14083826edr.78.2023.10.01.06.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:44:00 -0700 (PDT) Date: Sun, 1 Oct 2023 15:43:59 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] staging: rtl8192e: Remove ibss_maxjoin_chal Message-ID: <7c5d512a69e5832263a0a2e8f4ea3608fe286a09.1696165351.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 ibss_maxjoin_chal as it is just set and never evaluated. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 3 --- drivers/staging/rtl8192e/rtllib.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/d= ot11d.c index 82c11caeee7a..d0b7332645be 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -73,19 +73,16 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_= device *ieee) for (i =3D 12; i <=3D 14; i++) GET_DOT11D_INFO(ieee)->channel_map[i] =3D 2; ieee->bss_start_channel =3D 10; - ieee->ibss_maxjoin_chal =3D 11; break; =20 case COUNTRY_CODE_WORLD_WIDE_13: for (i =3D 12; i <=3D 13; i++) GET_DOT11D_INFO(ieee)->channel_map[i] =3D 2; ieee->bss_start_channel =3D 10; - ieee->ibss_maxjoin_chal =3D 11; break; =20 default: ieee->bss_start_channel =3D 1; - ieee->ibss_maxjoin_chal =3D 14; break; } } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index bdbd27e382b9..aa198983cb3c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1339,7 +1339,6 @@ struct rtllib_device { u8 active_channel_map[MAX_CHANNEL_NUMBER+1]; =20 u8 bss_start_channel; - u8 ibss_maxjoin_chal; =20 int rate; /* current rate */ int basic_rate; --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 17AF4E748ED for ; Sun, 1 Oct 2023 13:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235039AbjJANoP (ORCPT ); Sun, 1 Oct 2023 09:44:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235007AbjJANoN (ORCPT ); Sun, 1 Oct 2023 09:44:13 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C7B0F0 for ; Sun, 1 Oct 2023 06:44:10 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-533c71c5f37so3313408a12.0 for ; Sun, 01 Oct 2023 06:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167848; x=1696772648; 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=522MwXZqJUWHyXjMD6+ZKRNyT+zr9qIsF/KHqubKWwA=; b=jEsvwHUXLf0DBNe5Nm+ImP8hcNZ14U9GPgZ83hseQeSTmxtTtpyYDFCCMBGzIe8Sha A8c28ULtw0rAxMGqjxuHDsd4XvicpKjGn3FJdqO7EBGFO0q2E40LGbUaSeBDglEfrm1x UkTBApX1oINiIzcd7iW225DexmiDrR9mTFpWymVdoqp6alY2aPkAzuLl7WAJxMGRKyyb jxrP5LUHJYKwbgupztqU9A6NdS4z5yLYsGenCRovkG8UROC5Bci/G2woPRbjnZHbzRQm BIOzEPP+UeLO+tMloXLZ/mkjS1L2c9ck+LMeUEzj/1XwSaXwXP0WH6C6N5eo+BT6DQQG kZeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167848; x=1696772648; 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=522MwXZqJUWHyXjMD6+ZKRNyT+zr9qIsF/KHqubKWwA=; b=IjPu/1PsO3YpBklnXmewwacBXg2Uaij60Zn2Ae/SqiKJSWaHFZNES/zse09mAh+VKf k1g/yVOdfIL7qXbFUcVIDyWFfOjGPAmFX1aTlPSBsQJfaAd8YA/FCoCP416/kqFUozlj 15rJMA8yh18Jvemqmp5Ee506EjfBPWS6e2T3gOy3u9ihjzQW2w+fgXxQBRIBWezmnH41 8SguXjBvWdaXCmOJXUNMNdw9N092zwPT+N22n3j8HIkApMvwxmJUTtbRUNmz8TQFQ87N 7y3YTGkQEQ2ob9WwDvQTP/KGbpse5GIOQ/6kW1SZgiCDR8U92WGmr7HxN9CBLNN7npWc RWug== X-Gm-Message-State: AOJu0YwagHENZqhJJZbcp8dshoJIxd+9NB5kTXx4/ihjBgZ11lDssC6O 9BL4J1FKljpCt6XfZXLm0x21iHK/Ft0= X-Google-Smtp-Source: AGHT+IH1X/sCWgQUa5MwEqVHyRwzYptm0N4XJUzsCkcGYjg1aLdr7kQqWgTAJMGC/YuZsOPhr/n/MQ== X-Received: by 2002:a05:6402:5243:b0:51d:cfeb:fc3b with SMTP id t3-20020a056402524300b0051dcfebfc3bmr6777839edd.1.1696167848673; Sun, 01 Oct 2023 06:44:08 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id k15-20020aa7c38f000000b00537fee52351sm2743509edq.28.2023.10.01.06.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:44:08 -0700 (PDT) Date: Sun, 1 Oct 2023 15:44:06 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] staging: rtl8192e: Remove dead code from _rtl92e_if_check_reset() Message-ID: <5f29332205dd76896e981fa627925d62a6bf7f63.1696165351.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" The return value of _rtl92e_tx_check_stuck() and _rtl92e_rx_check_stuck() can only be RESET_TYPE_SILENT or RESET_TYPE_NORESET. This functions are only used in _rtl92e_if_check_reset(). In _rtl92e_if_check_reset() the return values are checked for RESET_TYPE_NORMAL which cannot occur. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 87f5441fbb10..f67923ccf790 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -975,12 +975,7 @@ static enum reset_type _rtl92e_if_check_reset(struct n= et_device *dev) (priv->rtllib->link_state =3D=3D MAC80211_LINKED)) RxResetType =3D _rtl92e_rx_check_stuck(dev); =20 - if (TxResetType =3D=3D RESET_TYPE_NORMAL || - RxResetType =3D=3D RESET_TYPE_NORMAL) { - netdev_info(dev, "%s(): TxResetType is %d, RxResetType is %d\n", - __func__, TxResetType, RxResetType); - return RESET_TYPE_NORMAL; - } else if (TxResetType =3D=3D RESET_TYPE_SILENT || + if (TxResetType =3D=3D RESET_TYPE_SILENT || RxResetType =3D=3D RESET_TYPE_SILENT) { netdev_info(dev, "%s(): TxResetType is %d, RxResetType is %d\n", __func__, TxResetType, RxResetType); --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 2F372E748F5 for ; Sun, 1 Oct 2023 13:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235037AbjJANo2 (ORCPT ); Sun, 1 Oct 2023 09:44:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235007AbjJANo1 (ORCPT ); Sun, 1 Oct 2023 09:44:27 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48E67F0 for ; Sun, 1 Oct 2023 06:44:24 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-537efaf742aso423233a12.0 for ; Sun, 01 Oct 2023 06:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167863; x=1696772663; 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=LEP+m1gZqUF2dlXF0HPKoDRFFOr5o0irSFxrQKPSymU=; b=g5xtz1LLx7pKg/SLCtrCrKb7YzcvGAJaYbvZtkKr92jwze/vMhMQ7CWarzlfEb/ZNQ ZJG9sqqtdcJU+7PGhTL0AgZ1sYpz8XPwC5OpmzrTyzLRYUrnd/PFo1/OADgOxhboWgB5 s4MBtGs/QlONWwq314vUhG8b/40CFhc1SYc4dD/FiaN1pVmZl+w2sf11CXq0iFAjaMVq /AoaP080f4leRIMzRAu0emtw8S4hi2TDsfVzXJsvHdIC4uFDr8w41IcTWV7zAhvZZF3j yHBnqCUtudV8Nr6QL9DNdEUT+wLY5K9SaVnoNSaXjpMYsOgGtvMnkwqgVUzogmET3sjH an+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167863; x=1696772663; 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=LEP+m1gZqUF2dlXF0HPKoDRFFOr5o0irSFxrQKPSymU=; b=QJcre7uYfgXwJ2F5X9IO88YjsqnCnOHSo7/AUYnajNF6aV8f19EiHkBqbuSys5VMm8 0hj8TPp/vcVxgyfd0wh3+Aru50Wc/6gwn7W8Jj3gIJhV/eYSX9PVFpdqiZ9VkRoebHER fnywpI3PHYbzYSJs+7hy6EK0gTGSXJs7NCf5dGTFM5kQ/MSTvxxx1uyY5BBk4ps6YMhC 14TluChGk358/t0+5LmH4S78hahJCDdLgdLjtvQiugeZuY+7PRbb0IWl4NTn5TSEpeYf ojH7goJ84XZ2d8dYFiXUYXSATOehO+xYZCr6HSCS4DCqhEGODCw5nM5qPYjPmToFw+eW N4Fg== X-Gm-Message-State: AOJu0YzGz3bHhxmZFDx0+jUaIobvl0M/TxBJ9uR0W6toChlH4HPYs/Ha sfKoOpvMRiJBMyXFB7kKqm0= X-Google-Smtp-Source: AGHT+IGMX9+Dus1EyYTTX1u5SQI+uSD22+wFbNFkFibaq9PlI6vVQ04/mlXa9JGWX/dXmflOSC/hWQ== X-Received: by 2002:a05:6402:26c5:b0:523:2e64:122b with SMTP id x5-20020a05640226c500b005232e64122bmr7806299edd.3.1696167862351; Sun, 01 Oct 2023 06:44:22 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id x18-20020aa7d6d2000000b0052febc781bfsm14037773edr.36.2023.10.01.06.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:44:22 -0700 (PDT) Date: Sun, 1 Oct 2023 15:44:20 +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 RESET_TYPE_NORMAL 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" ResetType =3D=3D RESET_TYPE_NORMAL is always false. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 ----- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index f67923ccf790..11d20fc11a7d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1237,11 +1237,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) } spin_unlock_irqrestore(&priv->tx_lock, flags); =20 - if (ResetType =3D=3D RESET_TYPE_NORMAL) { - priv->rst_progress =3D RESET_TYPE_NORMAL; - return; - } - if ((priv->force_reset || ResetType =3D=3D RESET_TYPE_SILENT)) _rtl92e_if_silent_reset(dev); priv->force_reset =3D false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index fa82a0667813..d6e924fc8011 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -132,7 +132,6 @@ enum rt_customer_id { =20 enum reset_type { RESET_TYPE_NORESET =3D 0x00, - RESET_TYPE_NORMAL =3D 0x01, RESET_TYPE_SILENT =3D 0x02 }; =20 --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 3F766E748E9 for ; Sun, 1 Oct 2023 13:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235041AbjJANoh (ORCPT ); Sun, 1 Oct 2023 09:44:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235038AbjJANof (ORCPT ); Sun, 1 Oct 2023 09:44:35 -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 33B62E5 for ; Sun, 1 Oct 2023 06:44:32 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-52f1ece3a76so4227362a12.0 for ; Sun, 01 Oct 2023 06:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167870; x=1696772670; 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=Ym31JZcesETa7AS2f1umn/B+sSEpEuK3mEbxds3x3JU=; b=FR0F59Po9/alv7OBvUB5uBSPYOZJTl2FmjKNXha64wsmsV0UAgc2WCo4zy/Pi/d1Zo khivLauYZTrR9gCPQPy1z1RyZvTqlbNkFif69HHNgjs4cTb0f8Bl22Ak1zz8mRy/mfz2 OpFVQItLWlhLmyhNFlkTqIVAJTRmcK1n6jG53NumkztWeVXkA76X971sXvqi4L/VZW0x MHWC2Nwp7+AGPCXu4GTOxZHmbDl3W/l6yXHkdcwcty+2mIBnAqczPhPrC8moW7rVXi16 5xplX1Ued5Qq9YNKuS72rX24nN8yVZ7cPfG5cHfdpQOoEGsNSvR3JrcaB4ZjzERgzTal 53XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167870; x=1696772670; 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=Ym31JZcesETa7AS2f1umn/B+sSEpEuK3mEbxds3x3JU=; b=TQs/76+XdejAqXEuwOoiaROxoOZrpCjUNeqf01ZugXK41e7lKYs6Eypyol+8uM1nMO v2xSUA3iNBD8Zxnyt3NNu1VIVw3Ww7FnkK3TQ5kSetlYI12yBIeFkW1hH7AzbDXhtgtu X+ayOzGY3rvmev7Qj1ZMwaLp93dXwjEHkTkZEgdJgeMubC+G0nQKiHgzlWxr68S4WGXr 1zLdfoggoUo2hEm5Y3SdVLskFWp84fCm6brzFMZ0uAV1lH+w29UBqc7CaE8sfinSek1V fVNOPpYkYLS77CyIJGmBIfR181Sjna5mGU9TeA+XwExpxKX+Jz/02Q2pKIgTxS/xdQ81 DU+w== X-Gm-Message-State: AOJu0YzYaYWU+Ijj8+dXw5gHuyvubmFdLFIOH5JW6EwTfCzI7odvZe0r 0+ytynmHeyvprJg5AIN9V9w= X-Google-Smtp-Source: AGHT+IHCNDyM0yg+CQz5dfSM+EKe4Pd0E59Hd3zoNa1XRQq0Z9Lrjh/ux+e26rZ84y08df6ru7jkGQ== X-Received: by 2002:a17:906:74d4:b0:9ad:dfe7:b361 with SMTP id z20-20020a17090674d400b009addfe7b361mr6959151ejl.5.1696167870325; Sun, 01 Oct 2023 06:44:30 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id i22-20020a17090671d600b009a193a5acffsm15232229ejk.121.2023.10.01.06.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:44:30 -0700 (PDT) Date: Sun, 1 Oct 2023 15:44:28 +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 broken function _rtl92e_if_silent_reset() Message-ID: <8b1b04b512b5691968a49308fdc052973fbe5032.1696165351.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" When the function _rtl92e_if_silent_reset() is called the variable priv->rst_progress is set to RESET_TYPE_SILENT. Since priv->up is always true the function is left at "if (priv->up) {" without resetting. Now the function _rtl92e_if_silent_reset() is like deactivated because the equation at the very beginning is false: "if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) {" This leads to a state where the driver hangs in the reset state and cannot go forward. In 30% of the cases the wlan is disconnected and cannot reconnect. The rest of the time it continues working but no reset is done at all. Further requests for reset are ignored. Remove broken function _rtl92e_if_silent_reset() and remove return value of _rtl92e_if_check_reset() to avoid compiler warnings. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 113 +------------------ 1 file changed, 3 insertions(+), 110 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 11d20fc11a7d..43533410f8d6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -958,7 +958,7 @@ static enum reset_type _rtl92e_rx_check_stuck(struct ne= t_device *dev) return RESET_TYPE_NORESET; } =20 -static enum reset_type _rtl92e_if_check_reset(struct net_device *dev) +static void _rtl92e_if_check_reset(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); enum reset_type TxResetType =3D RESET_TYPE_NORESET; @@ -979,112 +979,8 @@ static enum reset_type _rtl92e_if_check_reset(struct = net_device *dev) RxResetType =3D=3D RESET_TYPE_SILENT) { netdev_info(dev, "%s(): TxResetType is %d, RxResetType is %d\n", __func__, TxResetType, RxResetType); - return RESET_TYPE_SILENT; - } else { - return RESET_TYPE_NORESET; - } -} - -static void _rtl92e_if_silent_reset(struct net_device *dev) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - u8 reset_times =3D 0; - int reset_status =3D 0; - struct rtllib_device *ieee =3D priv->rtllib; - unsigned long flag; - - if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { - priv->rst_progress =3D RESET_TYPE_SILENT; - - spin_lock_irqsave(&priv->rf_ps_lock, flag); - if (priv->rf_change_in_progress) { - spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - goto END; - } - priv->rf_change_in_progress =3D true; - priv->reset_in_progress =3D true; - spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - -RESET_START: - - mutex_lock(&priv->wx_mutex); - - if (priv->rtllib->link_state =3D=3D MAC80211_LINKED) - rtl92e_leisure_ps_leave(dev); - - if (priv->up) { - netdev_info(dev, "%s():the driver is not up.\n", - __func__); - mutex_unlock(&priv->wx_mutex); - return; - } - priv->up =3D 0; - - mdelay(1000); - - if (!netif_queue_stopped(dev)) - netif_stop_queue(dev); - - rtl92e_irq_disable(dev); - del_timer_sync(&priv->watch_dog_timer); - _rtl92e_cancel_deferred_work(priv); - rtl92e_dm_deinit(dev); - rtllib_stop_scan_syncro(ieee); - - if (ieee->link_state =3D=3D MAC80211_LINKED) { - mutex_lock(&ieee->wx_mutex); - netdev_info(dev, "ieee->link_state is MAC80211_LINKED\n"); - del_timer_sync(&ieee->associate_timer); - cancel_delayed_work(&ieee->associate_retry_wq); - rtllib_stop_scan(ieee); - netif_carrier_off(dev); - mutex_unlock(&ieee->wx_mutex); - } else { - netdev_info(dev, "ieee->link_state is NOT LINKED\n"); - rtllib_softmac_stop_protocol(priv->rtllib, 0, true); - } - - rtl92e_dm_backup_state(dev); - - mutex_unlock(&priv->wx_mutex); - reset_status =3D _rtl92e_up(dev, true); - - if (reset_status =3D=3D -1) { - if (reset_times < 3) { - reset_times++; - goto RESET_START; - } else { - netdev_warn(dev, "%s(): Reset Failed\n", - __func__); - } - } - - ieee->is_silent_reset =3D 1; - - spin_lock_irqsave(&priv->rf_ps_lock, flag); - priv->rf_change_in_progress =3D false; - spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - - rtl92e_enable_hw_security_config(dev); - - if (ieee->link_state =3D=3D MAC80211_LINKED && ieee->iw_mode =3D=3D - IW_MODE_INFRA) { - ieee->set_chan(ieee->dev, - ieee->current_network.channel); - - schedule_work(&ieee->associate_complete_wq); - - } - - rtl92e_cam_restore(dev); - rtl92e_dm_restore_state(dev); -END: - priv->rst_progress =3D RESET_TYPE_NORESET; - priv->reset_count++; - priv->reset_in_progress =3D false; - - rtl92e_writeb(dev, UFWP, 1); } + return; } =20 static void _rtl92e_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxB= cnNum, @@ -1114,7 +1010,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) struct r8192_priv, watch_dog_wq); struct net_device *dev =3D priv->rtllib->dev; struct rtllib_device *ieee =3D priv->rtllib; - enum reset_type ResetType =3D RESET_TYPE_NORESET; static u8 check_reset_cnt; unsigned long flags; struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) @@ -1232,13 +1127,11 @@ static void _rtl92e_watchdog_wq_cb(void *data) spin_lock_irqsave(&priv->tx_lock, flags); if ((check_reset_cnt++ >=3D 3) && (!ieee->is_roaming) && (!priv->rf_change_in_progress) && (!psc->bSwRfProcessing)) { - ResetType =3D _rtl92e_if_check_reset(dev); + _rtl92e_if_check_reset(dev); check_reset_cnt =3D 3; } spin_unlock_irqrestore(&priv->tx_lock, flags); =20 - if ((priv->force_reset || ResetType =3D=3D RESET_TYPE_SILENT)) - _rtl92e_if_silent_reset(dev); priv->force_reset =3D false; priv->reset_in_progress =3D false; } --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 08DB6E748ED for ; Sun, 1 Oct 2023 13:44:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234325AbjJANoq (ORCPT ); Sun, 1 Oct 2023 09:44:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235046AbjJANon (ORCPT ); Sun, 1 Oct 2023 09:44:43 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 946B7FF for ; Sun, 1 Oct 2023 06:44:39 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-9ae3d7eb7e0so470698566b.0 for ; Sun, 01 Oct 2023 06:44:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167878; x=1696772678; 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=WnFupUzVDS+wn/0FKIaw6slFldhEhqkX6Yuz2KNShag=; b=nsbgPsF+tnQuZDonWqGUCc45SddVkPpLbrjTFCwHo9VlnedYGKxFE0f87dnda1gZt3 kGD76R9dqzer/616XzrAkXJfkTyTKfeOT6DC2w0iswV943uE+QLhXgJ2B+g6ZsEp6r9V 3LgumzZT9XrUWdJ/lYmxI8Z2jGG3L7YnIEh65NAL/jCx8kzAsLKXyqIcFXLdw41ppiLi +icuM8Pu43XrCBtaKbOd0lHJTmS0KlqjzVQ7vt7ZqnD9a1uf+nzoV5TFgeZ5v4gkUkEv 9D2LhN7ex4/CYIcXRwiyrLQgmL5dX5n5wpxmpaE+el2bJ/ZUE4eVVaRn7mO2Tx0kstak OmCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167878; x=1696772678; 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=WnFupUzVDS+wn/0FKIaw6slFldhEhqkX6Yuz2KNShag=; b=LcYb+2V8/lOxnhGAFzZYM0Vpud9hbZrVezzQ0hlL657n/0S2+YaGeGwTaJ3x+fkvbe LOXUPO8pIwTWRHYFR2dnZFuosPAahTGIPR2XZQ+n7PhgHzILCP/h+MiwMRKWEA87VDTj TGutFAE/fPFYpvPPa/VXVpX4VkPxVZtDJ6PcwlOt0D9taj8Hl3A54uuZvKruQBkm92nl eP+MIUfkpuwQvsXHV6J7MCDsjJTdEhGHOi5npNum+oPC7Ov4bkX5MbmnlsKFOLtmNx9Z mr6mFC8Y9TJuwFU+dQ+LocwTNgEDgSGZ4WlC8sSVNYlukV2AC0wlcMiR2ss4ZFsVidhE Eqsg== X-Gm-Message-State: AOJu0YziBOQ3ANOc9QJG5wtXKus8HFMihYtpry1h7R3KGspkAmh1MmDG SqaHI4o5EahU1o0Gw7K7uCX4AX2OmT0= X-Google-Smtp-Source: AGHT+IF2Zn4LT8sIx4V5cckExXaMAfCxsOzA/hk5qwE+A6GcFHq5VkMNGt4yIVr18tFuVsBkh84tdw== X-Received: by 2002:a17:906:2ce:b0:9ae:3f76:1091 with SMTP id 14-20020a17090602ce00b009ae3f761091mr6843417ejk.0.1696167877810; Sun, 01 Oct 2023 06:44:37 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id bv13-20020a170906b1cd00b00993a37aebc5sm15451246ejb.50.2023.10.01.06.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:44:37 -0700 (PDT) Date: Sun, 1 Oct 2023 15:44:35 +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 variable rst_progress Message-ID: <21f4ab4eff53cce0debcd113c2dc1718dc713aeb.1696165351.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" priv->rst_progress is set to RESET_TYPE_NORESET and never changed. All equations are true. Remove dead code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 100 ++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 3 files changed, 47 insertions(+), 55 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 9ffa9305ff5e..6cfc2254487b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -485,10 +485,10 @@ bool rtl92e_start_adapter(struct net_device *dev) start: rtl92e_reset_desc_ring(dev); priv->rf_mode =3D RF_OP_By_SW_3wire; - if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { - rtl92e_writeb(dev, ANAPAR, 0x37); - mdelay(500); - } + + rtl92e_writeb(dev, ANAPAR, 0x37); + mdelay(500); + priv->fw_info->status =3D FW_STATUS_0_INIT; =20 ulRegRead =3D rtl92e_readl(dev, CPU_GEN); @@ -518,21 +518,20 @@ bool rtl92e_start_adapter(struct net_device *dev) } =20 priv->loopback_mode =3D RTL819X_NO_LOOPBACK; - if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { - ulRegRead =3D rtl92e_readl(dev, CPU_GEN); - if (priv->loopback_mode =3D=3D RTL819X_NO_LOOPBACK) - ulRegRead =3D (ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | - CPU_GEN_NO_LOOPBACK_SET; - else if (priv->loopback_mode =3D=3D RTL819X_MAC_LOOPBACK) - ulRegRead |=3D CPU_CCK_LOOPBACK; - else - netdev_err(dev, "%s: Invalid loopback mode setting.\n", - __func__); + ulRegRead =3D rtl92e_readl(dev, CPU_GEN); + if (priv->loopback_mode =3D=3D RTL819X_NO_LOOPBACK) + ulRegRead =3D (ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | + CPU_GEN_NO_LOOPBACK_SET; + else if (priv->loopback_mode =3D=3D RTL819X_MAC_LOOPBACK) + ulRegRead |=3D CPU_CCK_LOOPBACK; + else + netdev_err(dev, "%s: Invalid loopback mode setting.\n", + __func__); =20 - rtl92e_writel(dev, CPU_GEN, ulRegRead); + rtl92e_writel(dev, CPU_GEN, ulRegRead); + + udelay(500); =20 - udelay(500); - } _rtl92e_hwconfig(dev); rtl92e_writeb(dev, CMDR, CR_RE | CR_TE); =20 @@ -567,8 +566,7 @@ bool rtl92e_start_adapter(struct net_device *dev) =20 rtl92e_writeb(dev, ACK_TIMEOUT, 0x30); =20 - if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) - rtl92e_set_wireless_mode(dev, priv->rtllib->mode); + rtl92e_set_wireless_mode(dev, priv->rtllib->mode); rtl92e_cam_reset(dev); { u8 SECR_value =3D 0x0; @@ -607,12 +605,10 @@ bool rtl92e_start_adapter(struct net_device *dev) } } =20 - if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { - rtStatus =3D rtl92e_config_rf(dev); - if (!rtStatus) { - netdev_info(dev, "RF Config failed\n"); - return rtStatus; - } + rtStatus =3D rtl92e_config_rf(dev); + if (!rtStatus) { + netdev_info(dev, "RF Config failed\n"); + return rtStatus; } =20 rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bCCKEn, 0x1); @@ -634,39 +630,37 @@ bool rtl92e_start_adapter(struct net_device *dev) else priv->rf_mode =3D RF_OP_By_SW_3wire; =20 - if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { - rtl92e_dm_init_txpower_tracking(dev); - - if (priv->ic_cut >=3D IC_VersionCut_D) { - tmpRegA =3D rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, - bMaskDWord); - rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord); - - for (i =3D 0; i < TX_BB_GAIN_TABLE_LEN; i++) { - if (tmpRegA =3D=3D dm_tx_bb_gain[i]) { - priv->rfa_txpowertrackingindex =3D i; - priv->rfa_txpowertrackingindex_real =3D i; - priv->rfa_txpowertracking_default =3D - priv->rfa_txpowertrackingindex; - break; - } + rtl92e_dm_init_txpower_tracking(dev); + + if (priv->ic_cut >=3D IC_VersionCut_D) { + tmpRegA =3D rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, + bMaskDWord); + rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord); + + for (i =3D 0; i < TX_BB_GAIN_TABLE_LEN; i++) { + if (tmpRegA =3D=3D dm_tx_bb_gain[i]) { + priv->rfa_txpowertrackingindex =3D i; + priv->rfa_txpowertrackingindex_real =3D i; + priv->rfa_txpowertracking_default =3D + priv->rfa_txpowertrackingindex; + break; } + } =20 - TempCCk =3D rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, - bMaskByte2); + TempCCk =3D rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, + bMaskByte2); =20 - for (i =3D 0; i < CCK_TX_BB_GAIN_TABLE_LEN; i++) { - if (TempCCk =3D=3D dm_cck_tx_bb_gain[i][0]) { - priv->cck_present_attn_20m_def =3D i; - break; - } + for (i =3D 0; i < CCK_TX_BB_GAIN_TABLE_LEN; i++) { + if (TempCCk =3D=3D dm_cck_tx_bb_gain[i][0]) { + priv->cck_present_attn_20m_def =3D i; + break; } - priv->cck_present_attn_40m_def =3D 0; - priv->cck_present_attn_diff =3D 0; - priv->cck_present_attn =3D - priv->cck_present_attn_20m_def; - priv->btxpower_tracking =3D false; } + priv->cck_present_attn_40m_def =3D 0; + priv->cck_present_attn_diff =3D 0; + priv->cck_present_attn =3D + priv->cck_present_attn_20m_def; + priv->btxpower_tracking =3D false; } rtl92e_irq_enable(dev); end: diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 43533410f8d6..7ca6a04d034c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -754,7 +754,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rfa_txpowertrackingindex =3D 0; priv->rfc_txpowertrackingindex =3D 0; priv->cck_pwr_enl =3D 6; - priv->rst_progress =3D RESET_TYPE_NORESET; priv->force_reset =3D false; 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 d6e924fc8011..855bee78c674 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -370,7 +370,6 @@ struct r8192_priv { u8 framesync; u32 reset_count; =20 - enum reset_type rst_progress; u16 tx_counter; u16 rx_ctr; bool reset_in_progress; --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 BCEC5E748E9 for ; Sun, 1 Oct 2023 13:45:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235036AbjJANpD (ORCPT ); Sun, 1 Oct 2023 09:45:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235007AbjJANpB (ORCPT ); Sun, 1 Oct 2023 09:45:01 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90895B8 for ; Sun, 1 Oct 2023 06:44:57 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9ae3d4c136fso419575266b.1 for ; Sun, 01 Oct 2023 06:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167896; x=1696772696; 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=WHEL4ZALe3kNObgKSEfdRhrWQpcI6CZqiH24RXB1Qgs=; b=ShLYEdisgxR8pGlw+Xm4zwb5vSGvxg2xmai3ta4Z913qe1UQV3BH9yo/L/kIVWv7NU iRCQMoeASHRPpfuroPqU3+dG5Y7tlWUMHONSexSOwS6bz9OMzrqtr+ZqfRhYO0ues5GQ Hfm5Q57y/VV1vxhuxa6uCrFiHHZGwpbNx/RGun9C9m2YeP/pFRP52Bfh/zSP3rq31FRR HMDY0GEHvURakurhW9fkeo6kkGt78rF1UshFjQzv4CMiqrl9nN4Ktpl9qtlorqX8NdT6 e1v3YYUj8EY/yidR8/JOin/sXQCgFk/9iPZXw2ilf3hDqwlEMogt6x1RoaE3Z4JmS9sm oJNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167896; x=1696772696; 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=WHEL4ZALe3kNObgKSEfdRhrWQpcI6CZqiH24RXB1Qgs=; b=mYW5uZx9JlA7+ZKGInof0zcrm3qxQ8KDJn2V0uZVlCeIQ3XuShmxG6/ArXdaDXS/Yl t/9cPyps/YiOMHNwxJwQmkmqlnEYXpT79leuzzDOzXDKeoAJoqbGIydalLqhNukAkc2y 8ShzVBI3NWM5v8QH+cjjdg54/+vbBSq+d6FVnXvikLa38HnZpAxwG8AJAW+yYdSjbcPo Vhtv17kCZafQ90XEhHo4JFl3N46sHMBn4rDOsMjeBjkgCiE3ZqQjr+MRkvWsKuSvu6wq gKmiVfl0PYKxWrFnEhkWsPaXLRW+8qyrmqIoBClRzyEBCQ7gYz9LNesTp3fKU2dyEJR8 HTCQ== X-Gm-Message-State: AOJu0YwlHO3aGl/xfQQG0vnUTK0S9o9napBL6OBsAmpJOgA0aPGx78b8 XbTktQ9vs7dyQyumFigAHsE= X-Google-Smtp-Source: AGHT+IHJsItI5qF7EHosVw7+KaqcorDCR6RAGP01XLgG4SDc3FBapzAv2L7WbSwVUtQngUO66Byy5Q== X-Received: by 2002:a17:906:74d4:b0:9ad:dfe7:b361 with SMTP id z20-20020a17090674d400b009addfe7b361mr6959767ejl.5.1696167895946; Sun, 01 Oct 2023 06:44:55 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id j8-20020a170906050800b009934855d8f1sm15380208eja.34.2023.10.01.06.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:44:55 -0700 (PDT) Date: Sun, 1 Oct 2023 15:44:54 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] staging: rtl8192e: Remove unused variable reset_in_progress Message-ID: <25259d69b955472a74725f3665238fb6daee76b4.1696165351.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" priv->reset_in_progress is set to false and never changed. All equations result accordingly. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 ++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 7ca6a04d034c..9da858510211 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1132,7 +1132,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) spin_unlock_irqrestore(&priv->tx_lock, flags); =20 priv->force_reset =3D false; - priv->reset_in_progress =3D false; } =20 static void _rtl92e_watchdog_timer_cb(struct timer_list *t) @@ -1218,8 +1217,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *sk= b, struct net_device *dev, MAX_DEV_ADDR_SIZE); u8 queue_index =3D tcb_desc->queue_index; =20 - if ((priv->rtllib->rf_power_state =3D=3D rf_off) || !priv->up || - priv->reset_in_progress) { + if ((priv->rtllib->rf_power_state =3D=3D rf_off) || !priv->up) { kfree_skb(skb); return; } @@ -1252,7 +1250,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *sk= b, struct net_device *dev) =20 if (queue_index !=3D TXCMD_QUEUE) { if ((priv->rtllib->rf_power_state =3D=3D rf_off) || - !priv->up || priv->reset_in_progress) { + !priv->up) { kfree_skb(skb); return 0; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 855bee78c674..fa5d0eec90d3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -372,7 +372,6 @@ struct r8192_priv { =20 u16 tx_counter; u16 rx_ctr; - bool reset_in_progress; bool force_reset; bool force_lps; }; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 561ea68de56a..fd5228e7a462 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -530,11 +530,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi= (struct net_device *dev) if (Pwr_Flag =3D=3D 0) { mdelay(1); =20 - if (priv->reset_in_progress) { - rtl92e_writeb(dev, Pw_Track_Flag, 0); - rtl92e_writeb(dev, FW_Busy_Flag, 0); - return; - } if (priv->rtllib->rf_power_state !=3D rf_on) { rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 77C5DE748ED for ; Sun, 1 Oct 2023 13:45:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235042AbjJANpJ (ORCPT ); Sun, 1 Oct 2023 09:45:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235046AbjJANpG (ORCPT ); Sun, 1 Oct 2023 09:45:06 -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 EF0B7E5 for ; Sun, 1 Oct 2023 06:45:02 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-5334f8a40e2so4097124a12.1 for ; Sun, 01 Oct 2023 06:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167901; x=1696772701; 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=ZsEg8H7d6fgrWJRtj3vP63E33mgGkOeEm3YkuheUnaU=; b=J5zAMPBtHmhAeR7pBlKR9uu7wUSVLCLQbicC/q2t0CWXRaGPHub785MwOweRwTu2Vr 8WHK+pjBr8ayoKh37zbImxkmfPys775ZS9LixBgD7y6YzUb96iILITOeBHGmnFdvo/TW wQBjNnP43ww80SrYzSUoNcXv2kXylNWVfRHE6sZN3eCZXouF59n+j0iryd9oPA9yDVw4 DYSULgp+9vogY3YDJO1iZFc0qmtenL38nE9FvtHevak79VxbSDYyZGx9eOl2pbXlpa2u BBFhMAOFGBMz/Pz8dcSQi6aUsOd+53Ya5ixlhM1ER2UUVghc6CmiazC5+grTEXuhOLjs 4BbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167901; x=1696772701; 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=ZsEg8H7d6fgrWJRtj3vP63E33mgGkOeEm3YkuheUnaU=; b=dfLGjQzHdP4S8shwQ4sS22MZkTFlxyakyo6qwxAJJsL1Ow2pbsjVMU74NhZJWkMYks VZKYyE5yZ44OFSgftG1R4If/nRf88OR8ufw1X7nCmv8gtgrRlCetTfJ4x2c88+KiVmr4 Q211pL/vbxNVe62O7PgTiu9Zo7DMNnVRqqcoLjs+NeShEdPWUVW2PslQ8qmQclzPz0Cn KBfmBal3jqYERW/6Z3h6QzRq72QUuw892mtrNyMdrn8PKsFw6ND3doKIMBMOAQThfl3+ 3oZZtirY6batq+G/mYHeL89ASEd/Eu/JNHPaIyBytOek3CydJKzeoPkE/kF+hjpAX6U2 HNfA== X-Gm-Message-State: AOJu0Yxmwr7e8v6OVSq757U1PXWQGfJ/HHF+wAr6rtRtuoYHoAouVIP7 pee5nkBZ1py+Kzq2WCaQodI= X-Google-Smtp-Source: AGHT+IGxP2K/34ynK04IRN9ZJtAvrHaYasGn81qD0BfShuuharbUUq9C3XyGoopLntj41nhu3xDzJA== X-Received: by 2002:a05:6402:2792:b0:51a:4d46:4026 with SMTP id b18-20020a056402279200b0051a4d464026mr7106424ede.0.1696167901402; Sun, 01 Oct 2023 06:45:01 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id f5-20020aa7d845000000b005364b54a4basm4297223eds.80.2023.10.01.06.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:45:01 -0700 (PDT) Date: Sun, 1 Oct 2023 15:44:59 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] staging: rtl8192e: Remove unused parameter from _rtl92e_sta_up() Message-ID: <105beac3b04bd73267b3e30e6b944b381dcfa8a1.1696165351.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 parameter is_silent_reset from _rtl92e_sta_up(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 9da858510211..94a73f9cf888 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -588,7 +588,7 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u= 8 wireless_mode) _rtl92e_refresh_support_rate(priv); } =20 -static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset) +static int _rtl92e_sta_up(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) @@ -1709,7 +1709,7 @@ static void _rtl92e_cancel_deferred_work(struct r8192= _priv *priv) =20 static int _rtl92e_up(struct net_device *dev, bool is_silent_reset) { - if (_rtl92e_sta_up(dev, is_silent_reset) =3D=3D -1) + if (_rtl92e_sta_up(dev) =3D=3D -1) return -1; return 0; } --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 25CA8E748E9 for ; Sun, 1 Oct 2023 13:45:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235056AbjJANpP (ORCPT ); Sun, 1 Oct 2023 09:45:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235026AbjJANpN (ORCPT ); Sun, 1 Oct 2023 09:45:13 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00F3EE8 for ; Sun, 1 Oct 2023 06:45:10 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-406553f6976so6205635e9.1 for ; Sun, 01 Oct 2023 06:45:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167909; x=1696772709; 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=Z+SB15LjBo6aILGXM+nVMfGuTrZhkGA5r6PNyI0UWDI=; b=Tn0vOWZULl6K1+ZkwsBnksha9pDq2Lf3yXy6k/oVphIA1i/CNuzF8J4Mxt3T51BWqB 0d78J5/OaLDRoi5vohsMBs0Ge1zYYCRcfWxs6ppTGYkfz9fhOHlrAcxFppCULv0GA2IG UCUNviwJTeR8L7V7XtbkDxUVl5DBgklw+quTHQGUIvWF52igV8OoqRaYsGt8fpssZ5TB 4mMH/prShCpcqiTz12yZ0B+r+87JUnRJcKGIr9oZC0D5/aYIOw6eJBeOsKIWwzazbaeZ +ZmH7daqSFngyPu7bYZVn0WYZIkfpAi0JOtoOgFjb5Qhax+S59F5hAMQHoOx4QReucj1 ALoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167909; x=1696772709; 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=Z+SB15LjBo6aILGXM+nVMfGuTrZhkGA5r6PNyI0UWDI=; b=FG8Faxq1S6IhBv3qLkVVgFIWAtRRJD0Ygz4YKc3y8ODxN0JjYKrQ8lePDpbA9l0dGf 3zOLYy8sJ4Pyz5a30VQKE4GbiWcXVHkx5j+in2D/uEEmKTPxfQtXkNV/V38cXeFTlZXO eNAa0DuNguUmwKMDzXWlBJDN/v4pGT5w7nQSIVoZ7uexk/v2yfcx4saz+mudByjvYHhc Z09cx/zc27ydE3TNMmOcXKluazp58EeE5EG+rJmQ+XI64teZyuCrxTxj+UV/LKm6wnSs hUEqLBs+aWlQ2KPeU6zUylIyjZJ3QHicSltsqDeloCNm1zBXXdXVjxmbkfZ27v1hBIIt mQtw== X-Gm-Message-State: AOJu0YyD1DZUVhJMoT48X7LuIysXTKN3J/KHoTia2wxmIllD/if0f+FV xM5VHQj0+gJhZNfEOImq9mg= X-Google-Smtp-Source: AGHT+IHFqni/ARgFFk2kkfNXSK4L4Jqc3PQeph4iWUAVQ0S82xK5l5NBfqntOWP0BKc6i3q71NwFpA== X-Received: by 2002:adf:dd91:0:b0:317:3da0:7606 with SMTP id x17-20020adfdd91000000b003173da07606mr7784635wrl.4.1696167909191; Sun, 01 Oct 2023 06:45:09 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id t21-20020a170906179500b00988e953a586sm15516694eje.61.2023.10.01.06.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:45:08 -0700 (PDT) Date: Sun, 1 Oct 2023 15:45:07 +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 parameter from _rtl92e_up() Message-ID: <24f221c44beae8e6fbf895f82fe04b082f8679d5.1696165351.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 parameter is_silent_reset from _rtl92e_up(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 94a73f9cf888..2b91c481df93 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -61,7 +61,7 @@ static short _rtl92e_pci_initdescring(struct net_device *= dev); static void _rtl92e_irq_tx_tasklet(struct tasklet_struct *t); static void _rtl92e_irq_rx_tasklet(struct tasklet_struct *t); static void _rtl92e_cancel_deferred_work(struct r8192_priv *priv); -static int _rtl92e_up(struct net_device *dev, bool is_silent_reset); +static int _rtl92e_up(struct net_device *dev); static int _rtl92e_try_up(struct net_device *dev); static int _rtl92e_down(struct net_device *dev, bool shutdownrf); static void _rtl92e_restart(void *data); @@ -1707,7 +1707,7 @@ static void _rtl92e_cancel_deferred_work(struct r8192= _priv *priv) cancel_work_sync(&priv->qos_activate); } =20 -static int _rtl92e_up(struct net_device *dev, bool is_silent_reset) +static int _rtl92e_up(struct net_device *dev) { if (_rtl92e_sta_up(dev) =3D=3D -1) return -1; @@ -1731,7 +1731,7 @@ static int _rtl92e_try_up(struct net_device *dev) =20 if (priv->up =3D=3D 1) return -1; - return _rtl92e_up(dev, false); + return _rtl92e_up(dev); } =20 static int _rtl92e_close(struct net_device *dev) @@ -1770,7 +1770,7 @@ void rtl92e_commit(struct net_device *dev) rtllib_softmac_stop_protocol(priv->rtllib, 0, true); rtl92e_irq_disable(dev); rtl92e_stop_adapter(dev, true); - _rtl92e_up(dev, false); + _rtl92e_up(dev); } =20 static void _rtl92e_restart(void *data) --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 3962EE748E9 for ; Sun, 1 Oct 2023 13:45:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235022AbjJANpV (ORCPT ); Sun, 1 Oct 2023 09:45:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235043AbjJANpT (ORCPT ); Sun, 1 Oct 2023 09:45:19 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D11DAF9 for ; Sun, 1 Oct 2023 06:45:16 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5221bd8f62eso3906801a12.1 for ; Sun, 01 Oct 2023 06:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167915; x=1696772715; 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=XJBUFu7bxKPi5/cjKbiiUEWg33kyTMQhk/fPobqwOVM=; b=Lz7yxkOZaGCzErCAZktYSi5zUAFhNAVzh+rAabUMQXMg9jeoY9t8n4xDtg/+7NpQT+ JknN5UVJFCftDjtCw/4GQ/dey0E1roeMgmg9dFLaQMdm4oSK+igfAsoPPBXlNShJgZM7 mtFmeOpYL+gZy2USXt2KyVmjCZtOn0BKPldib20Hfl1gJFKzyMJsV7HUwVmRXuftyK1j 52Zu6jYAJTGfvIMJQXD5kSK3CFpY3na6pGFKb7UawvJjUa3zzyOUVKvYV+JiodmM6inf NDx3hph3POyzyBx+AluwNj1LXygm9k/8h30SP2B9KtM3Fg76x0mliolIKtz+SVuR+due /jlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167915; x=1696772715; 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=XJBUFu7bxKPi5/cjKbiiUEWg33kyTMQhk/fPobqwOVM=; b=awSLH0aZYgTyesEAm9Lw5XemrDO3WrT0gPwLThhLHFg5jii30ckCxZepVo/I+RauSE pK0wEth5ykVgRypOusPx+ypLT9GbTUND+orltpeuqCTqGnrx+aSKXwx/yjw1baPCqx9s CQl5bBacbGL4OADGj1GRksUKIyxCWmlPgJMg4nGp/TrK0kDuBmhxkFENBFV7axENwM7A DPXd1o+JeK0Z4vHwBaCKXntQejHDqXGBVuzUs+zaatcURB73WDU6ctAtnBA8bvO5Z0Ay 7GnS3wTdCga5BD6Fb9u0oVqcWekOny++nd3J6CNQ27iegI7iHuievPXqYoybyjJOxuc/ ykNg== X-Gm-Message-State: AOJu0Ywn0+3aJewF+0ND6H9aTGXqsnp1IJCuI1nXcBkWHSDThdmGOU6K GvsMdiCufoKl9Um1n+/z6To= X-Google-Smtp-Source: AGHT+IFO2Ur+EotY/d0w3fxqHOa31udA1k4+93ugAEuEW89WOrwJhtH9oB7TiA9qwOkFbIN4dz/tEg== X-Received: by 2002:a05:6402:4403:b0:523:220e:a6ca with SMTP id y3-20020a056402440300b00523220ea6camr9357263eda.3.1696167915126; Sun, 01 Oct 2023 06:45:15 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id q8-20020a056402032800b00522828d438csm14009728edw.7.2023.10.01.06.45.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:45:14 -0700 (PDT) Date: Sun, 1 Oct 2023 15:45:13 +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 unused variable is_silent_reset Message-ID: <124d8f91db347e0e35184b356ba4ec39f52871cb.1696165351.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" ieee->is_silent_reset is set to false and never changed. All equations result accordingly. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index aa198983cb3c..004818520ea8 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1211,7 +1211,6 @@ struct rtllib_device { bool bForcedBgMode; =20 u8 hwsec_active; - bool is_silent_reset; bool is_roaming; bool ieee_up; bool cannot_notify; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 72d0225dfdf1..777338fd2664 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1298,10 +1298,8 @@ static void rtllib_associate_complete_wq(void *data) =20 netdev_info(ieee->dev, "Associated successfully with %pM\n", ieee->current_network.bssid); - if (!ieee->is_silent_reset) { - netdev_info(ieee->dev, "normal associate\n"); - notify_wx_assoc_event(ieee); - } + netdev_info(ieee->dev, "normal associate\n"); + notify_wx_assoc_event(ieee); =20 netif_carrier_on(ieee->dev); ieee->is_roaming =3D false; @@ -1334,10 +1332,6 @@ static void rtllib_associate_complete_wq(void *data) psc->LpsIdleCount =3D 0; ieee->link_change(ieee->dev); =20 - if (ieee->is_silent_reset) { - netdev_info(ieee->dev, "silent reset associate\n"); - ieee->is_silent_reset =3D false; - } } =20 static void rtllib_sta_send_associnfo(struct rtllib_device *ieee) --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 48FD4E748ED for ; Sun, 1 Oct 2023 13:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235063AbjJANpc (ORCPT ); Sun, 1 Oct 2023 09:45:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235032AbjJANp3 (ORCPT ); Sun, 1 Oct 2023 09:45:29 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79BC4C4 for ; Sun, 1 Oct 2023 06:45:25 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32337a39009so1722969f8f.1 for ; Sun, 01 Oct 2023 06:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167924; x=1696772724; 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=PSwRlj34WawnYB96b1PvZ1E7JgfJyhtAvZK5jo+OVcc=; b=A20CiVnlBJ1V3sE9irWV0eadnRS33xNpmFF/YNAWhW/T1lwwk4Og52jcwWcIRRmhee ZZpDHrTL/lW+A++MKLh7A8p/sDV5h7rzpUGfaTeyvZLhdGUTj9oB++pkFP4vt6bzEJCR PuChBsuTA/qbzv9sItwR2n1uC3rzqj3ZMSRMOjEiA5TnctwKa05rVqvRLmViybYwPn7c YLw9D3JWnJpt3icebfvRd6JkSxEIy5LNsLRK95FZg22axgKRuZ+1xRlBRO3mh36nh0Z6 sDObhB4DG2TFyS9xFeRR6MSgaxF299bF/jrTmxS7R2YV+QmVz/g6bss0wAPm9YrM2Hh/ gZIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167924; x=1696772724; 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=PSwRlj34WawnYB96b1PvZ1E7JgfJyhtAvZK5jo+OVcc=; b=gdv65jQZykKnD01+tHyt3mMyhNB8vMtq4TcA/Nzo33P6UYF916mbQUUYJ1+DB6srgx fR9jsG/KByDig4fQ5fZT8f9AlmhwmnNNby4OOqdv/GKl3srpj2JugSmKo2I/Pv1nmQGW n8MTemGjI3oJayAtinNigkDKJUL+7QhaFRzcAcIulRti+hid/ofrEcz98vcqnYHSoKAk lI7L1/DO0ig4q2B9ZgIzm6mEzw+U2+GMaZ/mgPi3Igu4EP8majcp/KnQNsma+UtLUDVO ovqOuKx2Oq4eOQNv1Q2sPTD752otvhNsZW2m73LdboHd3LdQYEr5PcjJMrRF4zl5wiJI yB6Q== X-Gm-Message-State: AOJu0YzDApNnRT0GU2lvXwYd4/+jtS5L48ohOKYy74PciO0KwAl06hMj vftPAP1nGOxgfO6xCYSnNTc4jF/O7GI= X-Google-Smtp-Source: AGHT+IFnyxfQdSg/E7QYc4x/qfBVxzxQg88geg32+X9f36EEmlbnkk8pvvwlVh6FB1dGxIch6EaUAw== X-Received: by 2002:a05:600c:1c9d:b0:405:39bb:38a8 with SMTP id k29-20020a05600c1c9d00b0040539bb38a8mr8229593wms.2.1696167923593; Sun, 01 Oct 2023 06:45:23 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id p17-20020aa7d311000000b00532bec5f768sm14061556edq.95.2023.10.01.06.45.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:45:23 -0700 (PDT) Date: Sun, 1 Oct 2023 15:45:21 +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 variables priv->reset_count and reset_cnt Message-ID: <27adae9b824a522280485b3d16f14893bf99da4c.1696165351.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 priv->reset_count, reset_cnt and reset_cnt_highpwr as those are always 0. All equations result accordingly. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 49 ++------------------ 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index fa5d0eec90d3..0ebebb3c2c35 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -368,7 +368,6 @@ struct r8192_priv { u32 continue_diff_count; bool bswitch_fsync; u8 framesync; - u32 reset_count; =20 u16 tx_counter; u16 rx_ctr; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index fd5228e7a462..c29bc85f9577 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1088,7 +1088,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_driver(st= ruct net_device *dev) static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device = *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - static u32 reset_cnt; u8 i; =20 if (!dm_digtable.dig_enable_flag) @@ -1108,10 +1107,8 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_al= arm(struct net_device *dev) (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_thresh)) return; if (priv->undecorated_smoothed_pwdb <=3D dm_digtable.rssi_low_thresh) { - if (dm_digtable.dig_state =3D=3D DM_STA_DIG_OFF && - (priv->reset_count =3D=3D reset_cnt)) + if (dm_digtable.dig_state =3D=3D DM_STA_DIG_OFF) return; - reset_cnt =3D priv->reset_count; =20 dm_digtable.dig_highpwr_state =3D DM_STA_DIG_MAX; dm_digtable.dig_state =3D DM_STA_DIG_OFF; @@ -1136,15 +1133,10 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_a= larm(struct net_device *dev) if (priv->undecorated_smoothed_pwdb >=3D dm_digtable.rssi_high_thresh) { u8 reset_flag =3D 0; =20 - if (dm_digtable.dig_state =3D=3D DM_STA_DIG_ON && - (priv->reset_count =3D=3D reset_cnt)) { + if (dm_digtable.dig_state =3D=3D DM_STA_DIG_ON) { _rtl92e_dm_ctrl_initgain_byrssi_highpwr(dev); return; } - if (priv->reset_count !=3D reset_cnt) - reset_flag =3D 1; - - reset_cnt =3D priv->reset_count; =20 dm_digtable.dig_state =3D DM_STA_DIG_ON; =20 @@ -1175,7 +1167,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_ala= rm(struct net_device *dev) static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - static u32 reset_cnt_highpwr; =20 if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_high_power_lowthresh) && @@ -1185,8 +1176,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(s= truct net_device *dev) =20 if (priv->undecorated_smoothed_pwdb >=3D dm_digtable.rssi_high_power_highthresh) { - if (dm_digtable.dig_highpwr_state =3D=3D DM_STA_DIG_ON && - (priv->reset_count =3D=3D reset_cnt_highpwr)) + if (dm_digtable.dig_highpwr_state =3D=3D DM_STA_DIG_ON) return; dm_digtable.dig_highpwr_state =3D DM_STA_DIG_ON; =20 @@ -1195,8 +1185,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(s= truct net_device *dev) else rtl92e_writeb(dev, rOFDM0_RxDetector1, 0x43); } else { - if (dm_digtable.dig_highpwr_state =3D=3D DM_STA_DIG_OFF && - (priv->reset_count =3D=3D reset_cnt_highpwr)) + if (dm_digtable.dig_highpwr_state =3D=3D DM_STA_DIG_OFF) return; dm_digtable.dig_highpwr_state =3D DM_STA_DIG_OFF; =20 @@ -1210,7 +1199,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(s= truct net_device *dev) rtl92e_writeb(dev, rOFDM0_RxDetector1, 0x44); } } - reset_cnt_highpwr =3D priv->reset_count; } =20 static void _rtl92e_dm_initial_gain(struct net_device *dev) @@ -1218,11 +1206,9 @@ static void _rtl92e_dm_initial_gain(struct net_devic= e *dev) struct r8192_priv *priv =3D rtllib_priv(dev); u8 initial_gain =3D 0; static u8 initialized, force_write; - static u32 reset_cnt; =20 if (dm_digtable.dig_algorithm_switch) { initialized =3D 0; - reset_cnt =3D 0; } =20 if (rtllib_act_scanning(priv->rtllib, true)) { @@ -1249,11 +1235,6 @@ static void _rtl92e_dm_initial_gain(struct net_devic= e *dev) dm_digtable.pre_ig_value =3D 0; } =20 - if (priv->reset_count !=3D reset_cnt) { - force_write =3D 1; - reset_cnt =3D priv->reset_count; - } - if (dm_digtable.pre_ig_value !=3D rtl92e_readb(dev, rOFDM0_XAAGCCore1)) force_write =3D 1; =20 @@ -1274,11 +1255,9 @@ static void _rtl92e_dm_pd_th(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); static u8 initialized, force_write; - static u32 reset_cnt; =20 if (dm_digtable.dig_algorithm_switch) { initialized =3D 0; - reset_cnt =3D 0; } =20 if (dm_digtable.pre_sta_connect_state =3D=3D dm_digtable.cur_sta_connect_= state) { @@ -1307,11 +1286,6 @@ static void _rtl92e_dm_pd_th(struct net_device *dev) dm_digtable.curpd_thstate =3D DIG_PD_AT_LOW_POWER; } =20 - if (priv->reset_count !=3D reset_cnt) { - force_write =3D 1; - reset_cnt =3D priv->reset_count; - } - if ((dm_digtable.prepd_thstate !=3D dm_digtable.curpd_thstate) || (initialized <=3D 3) || force_write) { if (dm_digtable.curpd_thstate =3D=3D DIG_PD_AT_LOW_POWER) { @@ -1340,13 +1314,10 @@ static void _rtl92e_dm_pd_th(struct net_device *dev) =20 static void _rtl92e_dm_cs_ratio(struct net_device *dev) { - struct r8192_priv *priv =3D rtllib_priv(dev); static u8 initialized, force_write; - static u32 reset_cnt; =20 if (dm_digtable.dig_algorithm_switch) { initialized =3D 0; - reset_cnt =3D 0; } =20 if (dm_digtable.pre_sta_connect_state =3D=3D dm_digtable.cur_sta_connect_= state) { @@ -1364,11 +1335,6 @@ static void _rtl92e_dm_cs_ratio(struct net_device *d= ev) dm_digtable.curcs_ratio_state =3D DIG_CS_RATIO_LOWER; } =20 - if (priv->reset_count !=3D reset_cnt) { - force_write =3D 1; - reset_cnt =3D priv->reset_count; - } - if ((dm_digtable.precs_ratio_state !=3D dm_digtable.curcs_ratio_state) || !initialized || force_write) { if (dm_digtable.curcs_ratio_state =3D=3D DIG_CS_RATIO_LOWER) @@ -1982,7 +1948,6 @@ static void _rtl92e_dm_check_fsync(struct net_device = *dev) #define RegC38_Fsync_AP_BCM 2 struct r8192_priv *priv =3D rtllib_priv(dev); static u8 reg_c38_State =3D RegC38_Default; - static u32 reset_cnt; =20 if (priv->rtllib->link_state =3D=3D MAC80211_LINKED && priv->rtllib->ht_info->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) { @@ -2066,12 +2031,6 @@ static void _rtl92e_dm_check_fsync(struct net_device= *dev) } } } - if (priv->reset_count !=3D reset_cnt) { - rtl92e_writeb(dev, rOFDM0_RxDetector3, - priv->framesync); - reg_c38_State =3D RegC38_Default; - reset_cnt =3D priv->reset_count; - } } =20 /*---------------------------Define function prototype--------------------= ----*/ --=20 2.42.0 From nobody Wed Jan 7 03:30:18 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 32451E748ED for ; Sun, 1 Oct 2023 13:45:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235059AbjJANpk (ORCPT ); Sun, 1 Oct 2023 09:45:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235068AbjJANpg (ORCPT ); Sun, 1 Oct 2023 09:45:36 -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 BDA78107 for ; Sun, 1 Oct 2023 06:45:30 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9ae3d7eb7e0so470716366b.0 for ; Sun, 01 Oct 2023 06:45:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696167929; x=1696772729; 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=F4mpp0HTqoMB98qe9eiYEXks5rNRdwSriBgWOGd0HtU=; b=HsxThKK5cuHz7Wwoe9bFRX6PmzcY0yvEXPv0GMqyoPCLMfv5o8VZO2W9/pzJUA4byo jQuD2AyCRhu6Uh6vq0VXubsi4nswpAvnRz0lj3E57I3PB4ITLrJsTjyUjJRwg+xkfdgt Zz0/+CWJAP/tMjdRbUvExn9Bovcn6G3mZKKvKxQtoe3e8zCWOev1yHVVU+2uiq/XsAfV 3uAcQclzXKUAc2y/9a73oBshEDDHT5y4bD1zXbRhSRr3a20Fakd8nCT5r24cjjXJqAG2 yzl9pyoMWgFGjYcfKiOHcSfMyLQutMrgvI8tQ5JaHEI5Q8W1Pz1u+TiMJqnJHyIo+pIG iR4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696167929; x=1696772729; 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=F4mpp0HTqoMB98qe9eiYEXks5rNRdwSriBgWOGd0HtU=; b=kyoUajQp7oL2+B4yrEWOzQNOxp8AkqAAvNMdzaSpEagWnCHDNQoTFNQThUDe77JjGx JuzkPMUGPjn8wWQqxcUzzzh8WSdCWrl1iZzdxPHY9yTGNB0VHd2fvJcTG7eGT+pEbDHO 4KK8/LDtEzjFCHXAPXniICzCyyxBXiRWV5NJRBMgLJVgoGgzMllDzXTf2lbQGZ7yjWP1 W1mJUsS9FCssw44M6r/X+VeE5O1Rg5czOKTyzSDU5S2YSnVIkjxN6uGaGQZlXbrwrAKs 9DXFH03uQf1vmo2wlLiyZj+shnvIO6/sYisrAsK6eI2GeMh4n4ir8SslWTYDjHgK5NFO 2X+A== X-Gm-Message-State: AOJu0YyX4EqkDnrujizdGMjAYIM6BlNgPwL8lvydI81Ltto3m097gSjE qYPg7W87rmYqM30eHiSyrww= X-Google-Smtp-Source: AGHT+IGNkNqp55500Dar/9Z/ljUObrvuldAHFjlgKHrcz54z7M5xcd0kE8B6BUbPJYEtmdXyb+UF7g== X-Received: by 2002:a17:906:2ce:b0:9ae:3f76:1091 with SMTP id 14-20020a17090602ce00b009ae3f761091mr6844214ejk.0.1696167928880; Sun, 01 Oct 2023 06:45:28 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id bn23-20020a170906c0d700b0099cd1c0cb21sm15429750ejb.129.2023.10.01.06.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:45:28 -0700 (PDT) Date: Sun, 1 Oct 2023 15:45:27 +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 r8192_private_handler _rtl92e_wx_force_reset() Message-ID: <8447643122088ff03dab65ac15e5e5199603008d.1696165351.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 r8192_private_handler _rtl92e_wx_force_reset() as driver does not reset. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 18 +----------------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 2b91c481df93..c4688c273f4b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -754,7 +754,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rfa_txpowertrackingindex =3D 0; priv->rfc_txpowertrackingindex =3D 0; priv->cck_pwr_enl =3D 6; - priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); priv->rx_ctr =3D 0; priv->rtllib->wx_set_enc =3D 0; @@ -1130,8 +1129,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) check_reset_cnt =3D 3; } spin_unlock_irqrestore(&priv->tx_lock, flags); - - priv->force_reset =3D false; } =20 static void _rtl92e_watchdog_timer_cb(struct timer_list *t) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 0ebebb3c2c35..deb707dfa443 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -371,7 +371,6 @@ struct r8192_priv { =20 u16 tx_counter; u16 rx_ctr; - bool force_reset; bool force_lps; }; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 17e7fcc01f70..ec09066f2f32 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -141,19 +141,6 @@ static int _rtl92e_wx_set_rawtx(struct net_device *dev, return ret; } =20 -static int _rtl92e_wx_force_reset(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - - mutex_lock(&priv->wx_mutex); - - priv->force_reset =3D *extra; - mutex_unlock(&priv->wx_mutex); - return 0; -} - static int _rtl92e_wx_adapter_power_status(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) @@ -1060,9 +1047,6 @@ static const struct iw_priv_args r8192_private_args[]= =3D { }, { SIOCIWFIRSTPRIV + 0x2, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "rawtx" - }, { - SIOCIWFIRSTPRIV + 0x3, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "forcereset" }, { SIOCIWFIRSTPRIV + 0x6, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, IW_PRIV_TYPE_NONE, @@ -1089,7 +1073,7 @@ static iw_handler r8192_private_handler[] =3D { (iw_handler)_rtl92e_wx_set_debug, /*SIOCIWSECONDPRIV*/ (iw_handler)_rtl92e_wx_set_scan_type, (iw_handler)_rtl92e_wx_set_rawtx, - (iw_handler)_rtl92e_wx_force_reset, + (iw_handler)NULL, (iw_handler)NULL, (iw_handler)NULL, (iw_handler)_rtl92e_wx_adapter_power_status, --=20 2.42.0