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);