From patchwork Sun Oct 1 13:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147097 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp879889vqb; Sun, 1 Oct 2023 06:46:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFOAcs35ocGFWD9j89A0kX6qlHBCCS/NIyolhys8cwlwXvbZfUOrsJA3EIk980Cya5riHSN X-Received: by 2002:a05:6a20:918a:b0:15a:f4e:620e with SMTP id v10-20020a056a20918a00b0015a0f4e620emr9034918pzd.59.1696167972686; Sun, 01 Oct 2023 06:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696167972; cv=none; d=google.com; s=arc-20160816; b=OuI/DmJ/hSsVDIPuTl0wStts1PdTtNKlZoGRLCgLYIUbJpG0w+KgmblIEU3bEeZVn9 Ee995Y/7i/yKHgcQgK5K0tMf+pgsRxmhl5RrJQu9htPaV/OhpXkzvpLLwvML4AoAxy/C qahSYbU+M6sQTGShELeP+uDFCvaUqCwIw5yaJKKhGyyIhddqvDOjcZKGrS272BuSRdiQ +8eYNhklkNTt3Bkf3eSLbfjpyIB22+SX017Sd4l1TfzZbUMyqrhp4TMGjmd4IwOUm669 8l1JkcFW8jFmkZYOwmMiqNsFwr07u7nLEY+jMoW7VFsX3/WyIHjeVnIXHzo3lO6ExoTU P12w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=LEP+m1gZqUF2dlXF0HPKoDRFFOr5o0irSFxrQKPSymU=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=Ig0vt2+vq/Pd7b2dIKj7TlE+zdySdTeVH/Ee1CO8Vvxp1sTAqisU+iXrlxCw35HBXQ /2u5zc1kC+AYDCqBn0RvYcIto2RIpBgcHzTHQykXoGpv6Z5CplDBc1mAay++7hc52/2t 4shvdJq91jITrOc6auuSTpXqq+y6bwC9UPZOuNIR2HxZaSt2otdVLviiIly79t0f3Vg9 W/TtvLHYj2Rjd5dOapQHO85aMdcmhBcioQK2BQHASH4e66FlI0gPQXwautGxyqr5wEDU e+Fc69UYOCIL3jzB9Ez6LWPtvtDlzjY/wwleagBmg9CarZ/aoYCVSeZo5eZ18/rJTWiZ L+5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=g5xtz1LL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s21-20020a63af55000000b00584ba113ec5si14470106pgo.370.2023.10.01.06.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:46:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=g5xtz1LL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 65632806AFE3; Sun, 1 Oct 2023 06:44:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235026AbjJANo2 (ORCPT + 18 others); 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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 01 Oct 2023 06:44:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778561027985710735 X-GMAIL-MSGID: 1778561027985710735 ResetType == 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); - if (ResetType == RESET_TYPE_NORMAL) { - priv->rst_progress = RESET_TYPE_NORMAL; - return; - } - if ((priv->force_reset || ResetType == RESET_TYPE_SILENT)) _rtl92e_if_silent_reset(dev); priv->force_reset = 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 { enum reset_type { RESET_TYPE_NORESET = 0x00, - RESET_TYPE_NORMAL = 0x01, RESET_TYPE_SILENT = 0x02 }; From patchwork Sun Oct 1 13:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp933608vqb; Sun, 1 Oct 2023 08:40:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7eQAHRbD24qzHSuOvqF6EnG90kw3Gj/D9nHyX4R/CRZTMuJZqSY7bQh+5RtHTDadKyenY X-Received: by 2002:a17:902:c155:b0:1c7:37e2:13e5 with SMTP id 21-20020a170902c15500b001c737e213e5mr9411041plj.21.1696174845814; Sun, 01 Oct 2023 08:40:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696174845; cv=none; d=google.com; s=arc-20160816; b=aCjJyOpK+mXa3H+nQhbNZpONWvSOZircWk++6hNcShbMvix/9nlvtXb1H47DwteI+r ljNCiwyxrLTdjqHKnlRLHVmIDfkA99SiKRwk99p8mWnuBpq+BtICZxveycI0XbWlRnb8 3IsKJrwqic0+jzcfDDFSouzEDudQOIiTOxk3PN+7dqJKJUqp/a5vEU5IRTRiFDm08eeG 5kxoQVsqFSuItZVzSF2rjHGIpE7rmgIQkAve0KixS+7uKwF24iYCPsgjLBKJi+jcfHsF VAv1NsR01WCdqzY+IjzE2hw4IzGkmaVl8jpxTA67cp2/lPXuPtMTnYNWynE93qSC3t4w r7hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=Ym31JZcesETa7AS2f1umn/B+sSEpEuK3mEbxds3x3JU=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=NJZKx3B1Cv3HFW3uqtFMiU1LWapkZb3V991G0bzBZAFYqV9Ia3tzTCM2wEGpyY9hrL OUrHN6x+PO3qJ7z7An4u1qAFb0sPUehIcgx7JUsCVdj6D/SFohmm5hOmRYJ7QKvjqcn3 ljzUPPe2znv6Zz3FzIFyWHt/ilIBW+LnNb8clyNriYEDxmUzt/9dxaXY4aO4YUCJAhWk vYH8cybAjrfdEHBstc3vscnMg7zHgaBKTqltQhE7IHHvlbdv3k87oWgKwPvN5EaSwpQk PSHUsQD7R8u1N+YSkpAx3TkstOqlfC+VG3stTG7bLTNJGWXPLq8eXQoyyvTjXBfZawkK PrUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FR0F59Po; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id x8-20020a170902ec8800b001c62c21c98esi15960573plg.10.2023.10.01.08.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 08:40:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FR0F59Po; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id E8522805FD18; Sun, 1 Oct 2023 06:45:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235044AbjJANog (ORCPT + 18 others); Sun, 1 Oct 2023 09:44:36 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 01 Oct 2023 06:45:37 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778563289970245777 X-GMAIL-MSGID: 1778568234841343566 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 == 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 net_device *dev) return RESET_TYPE_NORESET; } -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 = rtllib_priv(dev); enum reset_type TxResetType = RESET_TYPE_NORESET; @@ -979,112 +979,8 @@ static enum reset_type _rtl92e_if_check_reset(struct net_device *dev) RxResetType == 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 = rtllib_priv(dev); - u8 reset_times = 0; - int reset_status = 0; - struct rtllib_device *ieee = priv->rtllib; - unsigned long flag; - - if (priv->rst_progress == RESET_TYPE_NORESET) { - priv->rst_progress = 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 = true; - priv->reset_in_progress = true; - spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - -RESET_START: - - mutex_lock(&priv->wx_mutex); - - if (priv->rtllib->link_state == 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 = 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 == 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 = _rtl92e_up(dev, true); - - if (reset_status == -1) { - if (reset_times < 3) { - reset_times++; - goto RESET_START; - } else { - netdev_warn(dev, "%s(): Reset Failed\n", - __func__); - } - } - - ieee->is_silent_reset = 1; - - spin_lock_irqsave(&priv->rf_ps_lock, flag); - priv->rf_change_in_progress = false; - spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - - rtl92e_enable_hw_security_config(dev); - - if (ieee->link_state == MAC80211_LINKED && ieee->iw_mode == - 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 = RESET_TYPE_NORESET; - priv->reset_count++; - priv->reset_in_progress = false; - - rtl92e_writeb(dev, UFWP, 1); } + return; } static void _rtl92e_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum, @@ -1114,7 +1010,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) struct r8192_priv, watch_dog_wq); struct net_device *dev = priv->rtllib->dev; struct rtllib_device *ieee = priv->rtllib; - enum reset_type ResetType = RESET_TYPE_NORESET; static u8 check_reset_cnt; unsigned long flags; struct rt_pwr_save_ctrl *psc = (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++ >= 3) && (!ieee->is_roaming) && (!priv->rf_change_in_progress) && (!psc->bSwRfProcessing)) { - ResetType = _rtl92e_if_check_reset(dev); + _rtl92e_if_check_reset(dev); check_reset_cnt = 3; } spin_unlock_irqrestore(&priv->tx_lock, flags); - if ((priv->force_reset || ResetType == RESET_TYPE_SILENT)) - _rtl92e_if_silent_reset(dev); priv->force_reset = false; priv->reset_in_progress = false; } From patchwork Sun Oct 1 13:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147133 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp956274vqb; Sun, 1 Oct 2023 09:30:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG36DklMt09IFvOoiv3Cz5337G7l4OCY389Cshpk5E/3ytmwh07LnOT/35Z6hiFklFzCEMc X-Received: by 2002:a05:6870:a115:b0:1dd:7fa9:ed52 with SMTP id m21-20020a056870a11500b001dd7fa9ed52mr12252977oae.17.1696177830456; Sun, 01 Oct 2023 09:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696177830; cv=none; d=google.com; s=arc-20160816; b=YXQn5OdqaUrmrdizUuBV8Z/9RzPLcn1pMkfySV5oMI/Bgw3z+lbt69VOAxK+AFy4zK dM8C1vyfGh5XO7qm4jtcUfk1sVOpFT2b2c6yih+MyVIwXVRCi4rd8XdOW9rJUTPzFalU LMFa5Jk9D8gou5zsOHZV9Yc2bOUMyRAHQ9DpMbLKxfrdaeKd3FloNIv7bZQlbStAvGSV 2TXvXytasRfMGNCVFe+FsZHQ2rl9F/kEJbqggzNJe8RSU+zqdlCp32rL6fV6q8YP0ev3 J4Zq0Al9pg78j2E2FKWk5LB1N+Z7aQ7Wv2i5Yynx0toPiG3MKkKWbQBJ+7iC+bDk/REG fGlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=WnFupUzVDS+wn/0FKIaw6slFldhEhqkX6Yuz2KNShag=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=R3dfCVsIrsw2HrtaQwn6uoiAL2ZVN27gcxxu62UlQMIl7lbUpKPxYLwJAVlDEb3GfB U6WneRIcwisoFMSZfsVvJ0OnsUJzRSE9MQI9fL7O/csd2fRKRfWRnDGOmvjdLiK/0lDD 0+EWMnjKyE4O2l/Coawl4ndgRHr90G0OpIB8e14K4Qj52Pc9CORuUcLNlF9wbK3uaqTn 3x8F1JedJ8OKhNwWw4rJ74lMtcpj+sYFgoYu7RIUhcUANEOnfcgHszCESgOvq87+cdX/ ihPpRjb6Nl9D8YlHFdnawcWNFKGtiWpKjMIzLx7k4xFzOLEjY6G/cT36640Cb/vpP3PH GJsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nsbgPsF+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id x5-20020a654145000000b00578afd89ba6si20896277pgp.457.2023.10.01.09.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 09:30:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nsbgPsF+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2F33080658C1; Sun, 1 Oct 2023 06:44:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235040AbjJANop (ORCPT + 18 others); Sun, 1 Oct 2023 09:44:45 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 01 Oct 2023 06:44:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778571364930983557 X-GMAIL-MSGID: 1778571364930983557 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/staging/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 = RF_OP_By_SW_3wire; - if (priv->rst_progress == RESET_TYPE_NORESET) { - rtl92e_writeb(dev, ANAPAR, 0x37); - mdelay(500); - } + + rtl92e_writeb(dev, ANAPAR, 0x37); + mdelay(500); + priv->fw_info->status = FW_STATUS_0_INIT; ulRegRead = rtl92e_readl(dev, CPU_GEN); @@ -518,21 +518,20 @@ bool rtl92e_start_adapter(struct net_device *dev) } priv->loopback_mode = RTL819X_NO_LOOPBACK; - if (priv->rst_progress == RESET_TYPE_NORESET) { - ulRegRead = rtl92e_readl(dev, CPU_GEN); - if (priv->loopback_mode == RTL819X_NO_LOOPBACK) - ulRegRead = (ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | - CPU_GEN_NO_LOOPBACK_SET; - else if (priv->loopback_mode == RTL819X_MAC_LOOPBACK) - ulRegRead |= CPU_CCK_LOOPBACK; - else - netdev_err(dev, "%s: Invalid loopback mode setting.\n", - __func__); + ulRegRead = rtl92e_readl(dev, CPU_GEN); + if (priv->loopback_mode == RTL819X_NO_LOOPBACK) + ulRegRead = (ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | + CPU_GEN_NO_LOOPBACK_SET; + else if (priv->loopback_mode == RTL819X_MAC_LOOPBACK) + ulRegRead |= CPU_CCK_LOOPBACK; + else + netdev_err(dev, "%s: Invalid loopback mode setting.\n", + __func__); - rtl92e_writel(dev, CPU_GEN, ulRegRead); + rtl92e_writel(dev, CPU_GEN, ulRegRead); + + udelay(500); - udelay(500); - } _rtl92e_hwconfig(dev); rtl92e_writeb(dev, CMDR, CR_RE | CR_TE); @@ -567,8 +566,7 @@ bool rtl92e_start_adapter(struct net_device *dev) rtl92e_writeb(dev, ACK_TIMEOUT, 0x30); - if (priv->rst_progress == 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 = 0x0; @@ -607,12 +605,10 @@ bool rtl92e_start_adapter(struct net_device *dev) } } - if (priv->rst_progress == RESET_TYPE_NORESET) { - rtStatus = rtl92e_config_rf(dev); - if (!rtStatus) { - netdev_info(dev, "RF Config failed\n"); - return rtStatus; - } + rtStatus = rtl92e_config_rf(dev); + if (!rtStatus) { + netdev_info(dev, "RF Config failed\n"); + return rtStatus; } 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 = RF_OP_By_SW_3wire; - if (priv->rst_progress == RESET_TYPE_NORESET) { - rtl92e_dm_init_txpower_tracking(dev); - - if (priv->ic_cut >= IC_VersionCut_D) { - tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, - bMaskDWord); - rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord); - - for (i = 0; i < TX_BB_GAIN_TABLE_LEN; i++) { - if (tmpRegA == dm_tx_bb_gain[i]) { - priv->rfa_txpowertrackingindex = i; - priv->rfa_txpowertrackingindex_real = i; - priv->rfa_txpowertracking_default = - priv->rfa_txpowertrackingindex; - break; - } + rtl92e_dm_init_txpower_tracking(dev); + + if (priv->ic_cut >= IC_VersionCut_D) { + tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, + bMaskDWord); + rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord); + + for (i = 0; i < TX_BB_GAIN_TABLE_LEN; i++) { + if (tmpRegA == dm_tx_bb_gain[i]) { + priv->rfa_txpowertrackingindex = i; + priv->rfa_txpowertrackingindex_real = i; + priv->rfa_txpowertracking_default = + priv->rfa_txpowertrackingindex; + break; } + } - TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, - bMaskByte2); + TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, + bMaskByte2); - for (i = 0; i < CCK_TX_BB_GAIN_TABLE_LEN; i++) { - if (TempCCk == dm_cck_tx_bb_gain[i][0]) { - priv->cck_present_attn_20m_def = i; - break; - } + for (i = 0; i < CCK_TX_BB_GAIN_TABLE_LEN; i++) { + if (TempCCk == dm_cck_tx_bb_gain[i][0]) { + priv->cck_present_attn_20m_def = i; + break; } - priv->cck_present_attn_40m_def = 0; - priv->cck_present_attn_diff = 0; - priv->cck_present_attn = - priv->cck_present_attn_20m_def; - priv->btxpower_tracking = false; } + priv->cck_present_attn_40m_def = 0; + priv->cck_present_attn_diff = 0; + priv->cck_present_attn = + priv->cck_present_attn_20m_def; + priv->btxpower_tracking = 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_device *dev) priv->rfa_txpowertrackingindex = 0; priv->rfc_txpowertrackingindex = 0; priv->cck_pwr_enl = 6; - priv->rst_progress = RESET_TYPE_NORESET; priv->force_reset = false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); priv->rx_ctr = 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; - enum reset_type rst_progress; u16 tx_counter; u16 rx_ctr; bool reset_in_progress; From patchwork Sun Oct 1 13:44:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147164 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1062105vqb; Sun, 1 Oct 2023 14:31:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF7YGps92ofMhcb949f3x4fVYqC2960XjJOrdFMyqIwB1+QWgSURCfAWqWYv7hL1pqxUETV X-Received: by 2002:a05:6808:1a23:b0:3ae:2362:7137 with SMTP id bk35-20020a0568081a2300b003ae23627137mr12234395oib.59.1696195907099; Sun, 01 Oct 2023 14:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696195907; cv=none; d=google.com; s=arc-20160816; b=gsrj6uEiBSkCF0IzLS9D9hgXHNqX6LBIewkiUhrahV7owaRPJKqyDD8EGLBTJ3vDkO m/CQmdzJGbDP0rjQJQYo77sW46la/6PP2rCMSGTjwiLr0ZOF1MD/ybRMsJfqLPgq+Nvn qnyJo6TmWDWiAKnJbfHgPnr2Aw1G1pyRfwYRzwLEQORJQ1ZB1/8KTKckfIWwnXRC/Uq/ AecuWwErKrAhmlNlJ/fEl5IZsUgD0Nn/0Sx0LuknMZrl80xzkkMhqRFyrkX/OWjnpxv4 e/d6wEoaOZmQGGFJYQF8uhpnPsA8LfDLGNoqqxvRR1YpFrcJU439DCsBxH5zVJAezPmb oJmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=WHEL4ZALe3kNObgKSEfdRhrWQpcI6CZqiH24RXB1Qgs=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=Z6dX2W8u0l2apUoP48HzWdOpz/s8jQ4IqZKjQjlDiAt9rnwBbDgWUDzuOF24Ux33Qd n0jxBf1oyERi4zwVE1A14j+p8+c0Qnjpjh1Eg/cZYxOCxixWyK8F8MMPQeHYrO+udQt/ L2pCbB7ATgjePvBplCVfvBrOT1kenoHovp34UNJ988gFZAEyx15MA+OxkFnQr2BeeQEz j6/VeL6DdTayryKgdLLK8teJVseaKV7hc6Od+q/vd27OdVci+N/aLvHyWh/Li6bCv492 0jjSc00K3zsSHjiiYStt2Rn9Mjwai1MsuOsWxVC0qXpGJv9KiPVVPKWaBs8JDMO9xAnQ vpeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ShLYEdis; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id z18-20020a17090ad79200b0027681e3a57fsi6148284pju.162.2023.10.01.14.31.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 14:31:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ShLYEdis; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 4581F8097142; Sun, 1 Oct 2023 06:46:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235023AbjJANpC (ORCPT + 18 others); Sun, 1 Oct 2023 09:45:02 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 01 Oct 2023 06:46:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778590319103101462 X-GMAIL-MSGID: 1778590319103101462 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); priv->force_reset = false; - priv->reset_in_progress = false; } static void _rtl92e_watchdog_timer_cb(struct timer_list *t) @@ -1218,8 +1217,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, MAX_DEV_ADDR_SIZE); u8 queue_index = tcb_desc->queue_index; - if ((priv->rtllib->rf_power_state == rf_off) || !priv->up || - priv->reset_in_progress) { + if ((priv->rtllib->rf_power_state == rf_off) || !priv->up) { kfree_skb(skb); return; } @@ -1252,7 +1250,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (queue_index != TXCMD_QUEUE) { if ((priv->rtllib->rf_power_state == 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 { 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/rtl8192e/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 == 0) { mdelay(1); - 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 != rf_on) { rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); From patchwork Sun Oct 1 13:45:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp879989vqb; Sun, 1 Oct 2023 06:46:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYg1MTNudFT2L70YG60JnsZTpBYCztoExARYWuP/GZ9lwcaHOhyL7MUcnQyrv8d6vwIiUe X-Received: by 2002:a05:6a20:dd9f:b0:156:851e:b167 with SMTP id kw31-20020a056a20dd9f00b00156851eb167mr6676223pzb.44.1696167988316; Sun, 01 Oct 2023 06:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696167988; cv=none; d=google.com; s=arc-20160816; b=Lg6bW4jkmXzGlSk7/uMQhrHqS+umeeycERBPHeLcfzv8zdU+RLPGzcVNzpdBdfmzNz NwGsiXGIrgtiUfOLH7xhufnYQ7KzZorlTs3zRx1DYSo9DzGLhxgelyp49z9hkxmedl27 kpaNEfomqP3X3EKpxAXdxGGlounqe92D7hgpkcZdDK8QSjFQwtAJaM6cWBZAcbEFfTTE JmyPUFvbhOy+QjBQiijsPFvgZZuO1DFCOOMThysgklOu7OGFg7L3J73Q+I0/hBSk2kzL HhrxpBl+BjfBwhl8uS8TMgiS/UJrFqkrG71bAPaC4V1codJi3IFCDg2X0ZwSFSkyXngp iAfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=XJBUFu7bxKPi5/cjKbiiUEWg33kyTMQhk/fPobqwOVM=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=XXfMqI+8JpRdQk/JRaSByWvLJuvTnMUMI8MJdaoSOCbsYeQ64cmPYCmKhcw01/8zDi ocr6ycxdf9vfHaNBfaHHy3X9gUM/Jo0gQ2V7yBrEjhBhe6MB0aRGlnTlTBfkZoOlFvUU rdTu/XJySVGi6y48YXGCxO693Z0k99qj2GWwizM6SdF/CMlJRQsDZZ+JE+uIgrJdzcfo dYwaIuD9s+bJUFpta5AvXO7cxuCYGPe5H3FhUNAPJDtQvH+47k+j6YubIaS2Z18vuX6e rIczJQasSex5cNtEVv2dOje02uMwZg5pJdoIKukwSb7tyf94bfZIN8zv8SUePz8CL/ub FEVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Lz7yxkOZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id l5-20020a170903120500b001b84335fb90si26533103plh.286.2023.10.01.06.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 06:46:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Lz7yxkOZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id E1BF38022C22; Sun, 1 Oct 2023 06:45:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235048AbjJANpU (ORCPT + 18 others); Sun, 1 Oct 2023 09:45:20 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Sun, 01 Oct 2023 06:45:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778561044505357441 X-GMAIL-MSGID: 1778561044505357441 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/rtllib.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; 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/rtl8192e/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) 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); netif_carrier_on(ieee->dev); ieee->is_roaming = false; @@ -1334,10 +1332,6 @@ static void rtllib_associate_complete_wq(void *data) psc->LpsIdleCount = 0; ieee->link_change(ieee->dev); - if (ieee->is_silent_reset) { - netdev_info(ieee->dev, "silent reset associate\n"); - ieee->is_silent_reset = false; - } } static void rtllib_sta_send_associnfo(struct rtllib_device *ieee) From patchwork Sun Oct 1 13:45:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147518 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1719376vqb; Mon, 2 Oct 2023 15:11:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGf5Ehn1Xs3HTJ5M9xYjx7S42OQ1z0FlhLqWTdEUWcQoKuoxD42hWZIrYjBgK7GJYt+SFBo X-Received: by 2002:a9d:6b99:0:b0:6bd:c865:a618 with SMTP id b25-20020a9d6b99000000b006bdc865a618mr13699718otq.13.1696284684230; Mon, 02 Oct 2023 15:11:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284684; cv=none; d=google.com; s=arc-20160816; b=jxvx/oyHsaeEMb9/xqYXxDddSyWi+RevkJ7GkGBv+6vGUASgtxLJPsF2854INzQmig TdOENt2QSvO2HbnADvQGjq6/Dr877qDPGM3GBBS74hn8g/ca+LHCj8cw3OyfNMU3C1tG wAT/52LOBAT/TJw6v0qAABWEwVvDWsY6swN1UVarituv3dYxyBpUzBiQe7mdTFerTQqb 60vEhXC1nvrBrVpyhEGX2D8kC5ibz07+4a4ChcPl4LIjIXoOfjyLFrSy+UT1Xf+8SvBp dfGss2k+FM33Xev6z0VyI9DaXpbsmMtIFtvhw4X+MMyK1ajqo2ByRFRyg64DgDw5Fky5 ofPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=PSwRlj34WawnYB96b1PvZ1E7JgfJyhtAvZK5jo+OVcc=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=JN+knYmIrAkZkzaZ9eeGvPDqdv1Ga/LGnQCQlqqRuXYlE8EdQsGhezxVM7mnvONX5E wfIK+l++GfhkoXlcSfqXBOrrqBLYJy/6tMBAYOcPKrJlA5BXGlTb5pUcvfP+X4Btu9Rq FLjNR8mn1sWb4Bv5EFli5uxX6Ko/pjme0rYvNmM/OWV4XDp2NmJ1hJ1vJI5YO3w6srY3 6T1CTc8MNDsSbjQ+3gQBoVXY9yaTbjRJlBLSeHiUTEWbLJAZQqVfZDSsdLgfEZb5/yc9 /uQwen7impTN4gDTrtIs3h1LOceVza4e0DxLIf95xxbkMo/caeLfiLHIusojc3c8XCp2 JeuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=A20CiVnl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id be3-20020a656e43000000b005849fe1d3afsi16834484pgb.847.2023.10.02.15.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:11:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=A20CiVnl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id B3D4C80746B8; Sun, 1 Oct 2023 06:45:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235062AbjJANpb (ORCPT + 18 others); Sun, 1 Oct 2023 09:45:31 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 01 Oct 2023 06:45:37 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778683409061419068 X-GMAIL-MSGID: 1778683409061419068 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; u16 tx_counter; u16 rx_ctr; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/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(struct net_device *dev) static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - static u32 reset_cnt; u8 i; if (!dm_digtable.dig_enable_flag) @@ -1108,10 +1107,8 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_thresh)) return; if (priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh) { - if (dm_digtable.dig_state == DM_STA_DIG_OFF && - (priv->reset_count == reset_cnt)) + if (dm_digtable.dig_state == DM_STA_DIG_OFF) return; - reset_cnt = priv->reset_count; dm_digtable.dig_highpwr_state = DM_STA_DIG_MAX; dm_digtable.dig_state = DM_STA_DIG_OFF; @@ -1136,15 +1133,10 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) { u8 reset_flag = 0; - if (dm_digtable.dig_state == DM_STA_DIG_ON && - (priv->reset_count == reset_cnt)) { + if (dm_digtable.dig_state == DM_STA_DIG_ON) { _rtl92e_dm_ctrl_initgain_byrssi_highpwr(dev); return; } - if (priv->reset_count != reset_cnt) - reset_flag = 1; - - reset_cnt = priv->reset_count; dm_digtable.dig_state = DM_STA_DIG_ON; @@ -1175,7 +1167,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - static u32 reset_cnt_highpwr; if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_high_power_lowthresh) && @@ -1185,8 +1176,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_power_highthresh) { - if (dm_digtable.dig_highpwr_state == DM_STA_DIG_ON && - (priv->reset_count == reset_cnt_highpwr)) + if (dm_digtable.dig_highpwr_state == DM_STA_DIG_ON) return; dm_digtable.dig_highpwr_state = DM_STA_DIG_ON; @@ -1195,8 +1185,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) else rtl92e_writeb(dev, rOFDM0_RxDetector1, 0x43); } else { - if (dm_digtable.dig_highpwr_state == DM_STA_DIG_OFF && - (priv->reset_count == reset_cnt_highpwr)) + if (dm_digtable.dig_highpwr_state == DM_STA_DIG_OFF) return; dm_digtable.dig_highpwr_state = DM_STA_DIG_OFF; @@ -1210,7 +1199,6 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) rtl92e_writeb(dev, rOFDM0_RxDetector1, 0x44); } } - reset_cnt_highpwr = priv->reset_count; } static void _rtl92e_dm_initial_gain(struct net_device *dev) @@ -1218,11 +1206,9 @@ static void _rtl92e_dm_initial_gain(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); u8 initial_gain = 0; static u8 initialized, force_write; - static u32 reset_cnt; if (dm_digtable.dig_algorithm_switch) { initialized = 0; - reset_cnt = 0; } if (rtllib_act_scanning(priv->rtllib, true)) { @@ -1249,11 +1235,6 @@ static void _rtl92e_dm_initial_gain(struct net_device *dev) dm_digtable.pre_ig_value = 0; } - if (priv->reset_count != reset_cnt) { - force_write = 1; - reset_cnt = priv->reset_count; - } - if (dm_digtable.pre_ig_value != rtl92e_readb(dev, rOFDM0_XAAGCCore1)) force_write = 1; @@ -1274,11 +1255,9 @@ static void _rtl92e_dm_pd_th(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); static u8 initialized, force_write; - static u32 reset_cnt; if (dm_digtable.dig_algorithm_switch) { initialized = 0; - reset_cnt = 0; } if (dm_digtable.pre_sta_connect_state == dm_digtable.cur_sta_connect_state) { @@ -1307,11 +1286,6 @@ static void _rtl92e_dm_pd_th(struct net_device *dev) dm_digtable.curpd_thstate = DIG_PD_AT_LOW_POWER; } - if (priv->reset_count != reset_cnt) { - force_write = 1; - reset_cnt = priv->reset_count; - } - if ((dm_digtable.prepd_thstate != dm_digtable.curpd_thstate) || (initialized <= 3) || force_write) { if (dm_digtable.curpd_thstate == DIG_PD_AT_LOW_POWER) { @@ -1340,13 +1314,10 @@ static void _rtl92e_dm_pd_th(struct net_device *dev) static void _rtl92e_dm_cs_ratio(struct net_device *dev) { - struct r8192_priv *priv = rtllib_priv(dev); static u8 initialized, force_write; - static u32 reset_cnt; if (dm_digtable.dig_algorithm_switch) { initialized = 0; - reset_cnt = 0; } if (dm_digtable.pre_sta_connect_state == dm_digtable.cur_sta_connect_state) { @@ -1364,11 +1335,6 @@ static void _rtl92e_dm_cs_ratio(struct net_device *dev) dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER; } - if (priv->reset_count != reset_cnt) { - force_write = 1; - reset_cnt = priv->reset_count; - } - if ((dm_digtable.precs_ratio_state != dm_digtable.curcs_ratio_state) || !initialized || force_write) { if (dm_digtable.curcs_ratio_state == 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 = rtllib_priv(dev); static u8 reg_c38_State = RegC38_Default; - static u32 reset_cnt; if (priv->rtllib->link_state == MAC80211_LINKED && priv->rtllib->ht_info->IOTPeer == HT_IOT_PEER_BROADCOM) { @@ -2066,12 +2031,6 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) } } } - if (priv->reset_count != reset_cnt) { - rtl92e_writeb(dev, rOFDM0_RxDetector3, - priv->framesync); - reg_c38_State = RegC38_Default; - reset_cnt = priv->reset_count; - } } /*---------------------------Define function prototype------------------------*/