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;