From patchwork Sun Jan 29 14:58:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1776545wrn; Sun, 29 Jan 2023 07:05:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXs1NMN2EL/uO93qyN8FVhQawAObHxjE9FzlN5Odp7xodQhB4D0MNjpkO6ZBFZbpoiyANE4M X-Received: by 2002:a17:906:583:b0:7c1:65f5:7b95 with SMTP id 3-20020a170906058300b007c165f57b95mr47590161ejn.26.1675004722564; Sun, 29 Jan 2023 07:05:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004722; cv=none; d=google.com; s=arc-20160816; b=bttzcxaOun3FXc0THl2n6PjTU3iqL1/pkhMOSr6sQNuNik5vkZTbCkR7tI8I73hu04 Ock76Mk1nPhAQSJWMYF6IYhopoSO05kAPjl9QNq998dLCPLoWOp0filXTNeoutseFLjv wMqeRTkJPc/NrikT+ebfF6IFsnolCI/03owJLAKUt2kWm69u+p3bA2QnQUrzTRKsBL2s 8Pal8u4LIWtt5F9X9it5O0u4E9LA2a1hBY+AZEzkVXsOME/7WM0Y4OHGcALLgZP+LZiN RCp0BEG0ESVYwLxvD0cGXkpS78YWcyRHnW+WNV3HmJ6pm2LDHCMihl/VWveJ6XUZ6jLm EOaA== 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=FlMjHgQlaK6FHnQDYx0IosytZPIxnHkiOAPvdi19oaQ=; b=BswoXSk0tt7am5qFkTWIl3kgy0lKZ3uX9F+K6HQ583ZZBnxGnMs5VF96+wslqsg9zk qpRHShFgZVzKNgem/3aslu6qQgb1UnXQk8AM/64EYQEak4cPHRhhOFYFMDf8+OsFsk6M dM8JqCn+a4FmqYAxoqCXoNDpolIRSb7nxs9VcyzF7bdK1/KXDg0W5HK4I3CPhwohthgC 63OuYu7jz5pJOQ0qPkj8kNiOZHcBV4LBy/uPTkf7X+jDuIFNaACT4I7Zo0yr9YZItL2N v1WLhHwQtznc31V1tDQs9VGHE7JqNjV/vrzGKvk52e19qYB5lVyEo/Sytvdo4qMMljgR FSiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Y1HiMOEf; 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 r5-20020a170906a20500b008784bf181ebsi12385345ejy.147.2023.01.29.07.04.58; Sun, 29 Jan 2023 07:05:22 -0800 (PST) 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=Y1HiMOEf; 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 S235056AbjA2O7Z (ORCPT + 99 others); Sun, 29 Jan 2023 09:59:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234928AbjA2O7S (ORCPT ); Sun, 29 Jan 2023 09:59:18 -0500 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 C7D101E2A5 for ; Sun, 29 Jan 2023 06:58:53 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id k16so6448834wms.2 for ; Sun, 29 Jan 2023 06:58:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=FlMjHgQlaK6FHnQDYx0IosytZPIxnHkiOAPvdi19oaQ=; b=Y1HiMOEfkfEBI+WsKOWdGoVrlidn6m5IQOQ7p2ej9hLXLo9zhHSNSSNF4iUOPzpnnx CG1w/FQv/WoaFNymuO8yY5jwia+d1/xZgMCP64GfZ3sDgWIPZXy29kAeoy354d474PZP MfMMS0hn99o9c0/R9sHthbB+fQVryDRORZdd0X4OGROGOKraqe6mJ7y8ZRTRw/YI5XV5 doJGT1MIdxC8Re+2Swqjkl15hg2WW7g/0END+bUFDfmNAKExWI05MLGyc0XODxgxA9Zi nP8Vx9r0ZPpAZ6eCJT7MxEyrmtY/JXX4pX/Yjwdq/SZKCJMPFxo3s24H2wBFocXb3Ok6 G7qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=FlMjHgQlaK6FHnQDYx0IosytZPIxnHkiOAPvdi19oaQ=; b=PMEH37w+M1YXAPpvlmg9xmu+llixYZiDzRbPUW+rveWp+SZEY/QwnKVAwUPluRdf5r x50fBQV5N2iVYrTYgdeatniEBVX9g8nI0Qatx4OsKcpTTZzOPRJbiSimJ9K2DbAtD+mc MIZwI6BecDvQhfYePERTfT18Brnr6FR4YgopoL04MLxOBXAz3/AIvSOFyP4EAfbkmYVV 7hP1pNFGTqeWUmaCLlmtLjzwNFy0u02uLDWDhGTKYNjKlC6TBV9W8CB4hGM4pmbxExIF GMeT2ciE5mn3cpOCTU2+NYw+xlHuzq8G+rO3ZALIvlG7zGePvRbSZEnyhWO4M/ngJINr EY4A== X-Gm-Message-State: AO0yUKWmQfYSX0WfCps7gH/kfsBxWMcuMkyXWKExjR4qXrP9D8B4tEbG B1wFtjXQSE4yiOf3tA4LqHk= X-Received: by 2002:a05:600c:1e02:b0:3dc:4234:fe89 with SMTP id ay2-20020a05600c1e0200b003dc4234fe89mr1793379wmb.2.1675004332439; Sun, 29 Jan 2023 06:58:52 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id z3-20020a05600c078300b003db12112fcfsm9931608wmo.4.2023.01.29.06.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:51 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:49 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Remove used constants MSR_LINK_SH.. and MSR_LINK_N.. Message-ID: <46bd1f075d5e4d211e1fc827843933907f7fee29.1675003608.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_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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756369751802727064?= X-GMAIL-MSGID: =?utf-8?q?1756369751802727064?= Remove used constants MSR_LINK_SHIFT = 0 and MSR_LINK_NONE = 0. Use rules a << 0 = a, 0 << 0 = 0 and msr | 0 = msr to remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 +++--------- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 1677b6c5d363..62f179f2f174 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -54,22 +54,16 @@ static void _rtl92e_update_msr(struct net_device *dev) switch (priv->rtllib->iw_mode) { case IW_MODE_INFRA: if (priv->rtllib->state == RTLLIB_LINKED) - msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT); - else - msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT); + msr |= MSR_LINK_MANAGED; LedAction = LED_CTL_LINK; break; case IW_MODE_ADHOC: if (priv->rtllib->state == RTLLIB_LINKED) - msr |= (MSR_LINK_ADHOC << MSR_LINK_SHIFT); - else - msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT); + msr |= MSR_LINK_ADHOC; break; case IW_MODE_MASTER: if (priv->rtllib->state == RTLLIB_LINKED) - msr |= (MSR_LINK_MASTER << MSR_LINK_SHIFT); - else - msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT); + msr |= MSR_LINK_MASTER; break; default: break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index 13c0e5218ecf..3782db125300 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -172,8 +172,6 @@ enum _RTL8192Pci_HW { MSR = 0x303, #define MSR_LINK_MASK ((1<<0)|(1<<1)) #define MSR_LINK_MANAGED 2 -#define MSR_LINK_NONE 0 -#define MSR_LINK_SHIFT 0 #define MSR_LINK_ADHOC 1 #define MSR_LINK_MASTER 3