From patchwork Fri Apr 7 21:50: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: 81063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp552489vqo; Fri, 7 Apr 2023 15:17:34 -0700 (PDT) X-Google-Smtp-Source: AKy350aEYJ+kMBmFbzE1+9YgDPPnOwM7Ke0vjGsUwszNxlKm0WfqRNoB62Wly1T+BxBAPPwtN13X X-Received: by 2002:a17:90b:4d81:b0:240:95a7:be70 with SMTP id oj1-20020a17090b4d8100b0024095a7be70mr3940894pjb.19.1680905853767; Fri, 07 Apr 2023 15:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680905853; cv=none; d=google.com; s=arc-20160816; b=OCP4rtzgbkUs0bE9jNNQBqwYdytlaiQJn2WnVhY0482JGQuHm/ld2t/Jz88rtY/Lxp y8rQ79AM7F99zbKgxvB8kpBRWckO466eujI9ZFAAfnbppLs6aC2e+bUxv7K5Q83gMP1P ucEPt412NwcieUVLT20PR6c/IAJ6z6i9MWV+GTU3lSpYLJDOuSPE0CSsBBjot2JVwqjj RoFRkSQJN6AKgnbE7yYbovMPiOPoNIZ4vKYSDedmX0cSmH8E4ZO2GdYz1N/STsD7HPaq aa4TlIOOGE4DgXAJ6DH2Od3cQRptGHsNciOHsviRU3jhwk78lKuHEV+QhCYiUYTm0sFs ojaw== 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=ZOZBenPjCQElNBV9GC58Q3qKs5/Fllkis9cJIxphAWQ=; b=omxyuDfvj/xFOoNiiClGCQ1zF0e8wf7Lc3lK5WFLrTfJulMjVUle1pwM0RGiOPm4X0 AoVTa/XpZ0WO/E+VAvsyfsEi/F+gbHT0l5kmT6kHehGcHbC0bE7Nv14wsmjQeR13zPGb /0TXqrSmBx28z8LNzw0qOO+z1BY2fqM4uCWJh9CzEgiNzEtXHsvVSC6GBORfuxPx0h/V JSGepNgLZUJ26IqoqjTv5KpgjSnRu5SpBRJXV4U02SMnQ0glNv6YwWi0X6ubCzwfWjcI 3DKowyegAxmRZ5cUVnyM+ibBaPUr8Srf+IoSVwsTGyidrJw0TqY0FZracvZExP9Mxgzk MGTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aHyx2cCO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j17-20020a170902da9100b001a1ad7123d0si4871033plx.555.2023.04.07.15.17.21; Fri, 07 Apr 2023 15:17:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aHyx2cCO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231283AbjDGVua (ORCPT + 99 others); Fri, 7 Apr 2023 17:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231281AbjDGVu1 (ORCPT ); Fri, 7 Apr 2023 17:50:27 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80BB6CA30 for ; Fri, 7 Apr 2023 14:50:25 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-947a47eb908so90104366b.0 for ; Fri, 07 Apr 2023 14:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680904224; x=1683496224; 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=ZOZBenPjCQElNBV9GC58Q3qKs5/Fllkis9cJIxphAWQ=; b=aHyx2cCO6il6cbGQZ0m/vQt1mipsG3YpejNkL9hASbNeefAnvW5W61Zx+c0eaAgaQw P7aFTmWzv6iMZk300l+Xqci3hSMGtbOlY6mQHNgsPJrreq3s9PhnAaLzxMNzUlU96f5G Vbpjlb2H5pcNlQc6xvsTaUsGiu5lNu/+v9VCj2Bk7n1mwsMJRCGtOKxjrmkmmnsAgpv3 knmT0AUwUr03eqw7BEuP2z2KX34TYe5UE8mA7DqAodRgZ9w++V2bKCVjBeXBzGjn9av6 u/6v/WnGc5C/NjZAfISdedeNlCe5iNeHuRDIbVy1dPAJyqE7UcJIkFv1vQ30/sTqV+4a auDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680904224; x=1683496224; 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=ZOZBenPjCQElNBV9GC58Q3qKs5/Fllkis9cJIxphAWQ=; b=3LzurRng9vh/tgpsOXBd46daAIlR0oU2qKyBq/lUu4gLiOH0skHpzKVAEs641VymeF DAJVON7DW5xXlS32irCiGhl0yhJU5P9H4G79NDem3InSXnoZnuhp6V67z7lhRQFe/93T h424kSSbrCEJXPIibWrfAtp47aU31JxzxnFQBbSQ8c1po3ofAv4upsCO3uXTYWR2Q7+/ mB/UZbrMcW/aLKEqhj61FOrBjc0FuzIpH8MAwLlvDYOPA0sbgMM2KJ7faxJYcx0t1Pa5 MgbOb7kPisUk6pXQdd4onWi3wZRLWx/J9u/H/mXGskB+swjH4EqYiuFdJPrOeJzRiZM0 eUtA== X-Gm-Message-State: AAQBX9eojIIrw+qIzyxZZ5d52kbDxVf77Srxco9IWyd7XBE5Nctiav+K 8hfJlHThnMzrzSs4MsdBMcQ= X-Received: by 2002:a17:906:51c8:b0:92f:27c2:13c0 with SMTP id v8-20020a17090651c800b0092f27c213c0mr673359ejk.6.1680904223811; Fri, 07 Apr 2023 14:50:23 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id lw26-20020a170906bcda00b009310d4dece9sm2450471ejb.62.2023.04.07.14.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 14:50:23 -0700 (PDT) Date: Fri, 7 Apr 2023 23:50:21 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] staging: rtl8192e: Remove macro IS_HARDWARE_TYPE_8192SE Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762557536625406194?= X-GMAIL-MSGID: =?utf-8?q?1762557536625406194?= Remove unused macro IS_HARDWARE_TYPE_8192SE as it is used only in code areas that are not executed when 8192SE hardware is found. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 2b2d8af4cf6e..b0aa76574738 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -52,9 +52,6 @@ #define DRV_AUTHOR "" #define DRV_VERSION "0014.0401.2010" -#define IS_HARDWARE_TYPE_8192SE(_priv) \ - (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192SE) - #define TOTAL_CAM_ENTRY 32 #define CAM_CONTENT_COUNT 8 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index cde41111012a..50486f2a6f3a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -214,8 +214,6 @@ void rtl92e_dm_init(struct net_device *dev) _rtl92e_dm_init_fsync(dev); _rtl92e_dm_init_rx_path_selection(dev); _rtl92e_dm_init_cts_to_self(dev); - if (IS_HARDWARE_TYPE_8192SE(dev)) - _rtl92e_dm_init_wa_broadcom_iot(dev); INIT_DELAYED_WORK(&priv->gpio_change_rf_wq, (void *)_rtl92e_dm_check_rf_ctrl_gpio); } @@ -816,10 +814,7 @@ static void _rtl92e_dm_check_tx_power_tracking_thermal(struct net_device *dev) static u8 TM_Trigger; u8 TxPowerCheckCnt = 0; - if (IS_HARDWARE_TYPE_8192SE(dev)) - TxPowerCheckCnt = 5; - else - TxPowerCheckCnt = 2; + TxPowerCheckCnt = 2; if (!priv->btxpower_tracking) return;