From patchwork Mon Jun 19 15:52:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Straube X-Patchwork-Id: 110086 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3105008vqr; Mon, 19 Jun 2023 09:06:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4bs0nyuzzqH0enXZCp6v52WLrbneK0954kiyHd+5MyT5pcf/oF95a8uhgwgSAS8Nqmjvg0 X-Received: by 2002:a17:90a:fb52:b0:25b:b4c6:d13e with SMTP id iq18-20020a17090afb5200b0025bb4c6d13emr5627977pjb.8.1687190797790; Mon, 19 Jun 2023 09:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687190797; cv=none; d=google.com; s=arc-20160816; b=l5awkUVOIro0s4BdTq4kU2ZXv3AnHSFvuOpBUuQkoMbtmmU+maG7cRHaW4JaQMSiiw e5KXQ0trRxkwDLoXX8TFyq3+fHiOHDBQPqE9vl2PxhEKTSB6AXx+uYLvq2CyWaAarNSX ybSryMszll6Qu90O9WrS7SzM7gLTy3HjO5SP1ocwCxige4OpvbUciDLP4elo7v/ckj3V vmN/OPcgM/qwLfTXOgMFFdLDwEnTzQE+lE5FM6Gg9L/7zK0aSvCiM6fZ5cpOAUCRhZPB BpDTaQuNTejaAXw8OPh4e3NKCQYbTKCcn+6+aMJdBG6R3fK0LQSCF+9DH6YhugCpWevZ JJpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=F7Sy5uyS4+3x47XHnoFiJXjC2wHKZ9yU1dlAX2FPVgA=; b=y7cYt9QpqQvlD5CvYUkP5bXMh2JfQpHp5g8POatKehfYXBjueMUUg1Er4W2HQazl1B G0pMO16YJGBz1kvENS44CGdHljAKFBsdoCXyTcyfEClhTTOW69hJSIZ2BLIhJqNbufGd K2N2XCwetlkwQuMpbeVUmQhPI+rvaBjCsIdasp+/b0RCIk6dWMeGEgedJ0wsowAJGbFf UDNgXH6ZlaBkDLea+XvX8PDzjxE9dQJ5nIqIycx1/w3VTEhkVA0OnWBFFhsmqKbzvuI+ ZAQYsJx6K8HsGkIcTlOgWpGu6lnFR27V76bP0t+pOwX2t/zxetR00jR3G48VJilw/5yy KEnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=jltWjB7r; 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 q90-20020a17090a4fe300b0025c095abe89si7547374pjh.56.2023.06.19.09.06.24; Mon, 19 Jun 2023 09:06:37 -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=20221208 header.b=jltWjB7r; 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 S230282AbjFSPw0 (ORCPT + 99 others); Mon, 19 Jun 2023 11:52:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbjFSPwY (ORCPT ); Mon, 19 Jun 2023 11:52:24 -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 E032B186 for ; Mon, 19 Jun 2023 08:52:22 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5195c85fbb2so4627693a12.2 for ; Mon, 19 Jun 2023 08:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687189941; x=1689781941; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=F7Sy5uyS4+3x47XHnoFiJXjC2wHKZ9yU1dlAX2FPVgA=; b=jltWjB7rpxGtsoZ3hQ45GSilkS/zyUMUgXjKWFvPjgqxOWSZ3/c9EJpZzx123KJHdZ ToDjJ4RxRxZTSu9wwxPIqIwxDh0ncMlaPxLdsSmUeK76QlzcFewF/LCPcS3yKptWLK9a Udi0VwSu4PsS3Zsz64f2wR7gdyzl54Tfm+bRJ0t/DazFZskXuYpzjFpeK1+F0QsbdVxD IrbabYTjzARI2VdXfDhQEPCHEU/xWiufL1spyHqH2mT25Mj0u8yj3oC8aZUbwtSGLcO/ WVBoIzNj9P821buYvUYzds/GsR2V11qFofVcCOQJrr/fCYSn+wTwWS47Y6rpb+1wp5eH SH4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687189941; x=1689781941; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=F7Sy5uyS4+3x47XHnoFiJXjC2wHKZ9yU1dlAX2FPVgA=; b=OXZ3p214bHVmc3vcw9pqkkyNGbYdXzTfnvu01tVaHlzkSFPQojXAcKM85sD1GqCqPd kdpEWI5rmTZrsOsICl3yvaItvZdGRwffRftPIMRYWCma20KJdJN7OWGtZISllCfA0R9o 43jEAeff7rlZlQxPuCj/q5oXd07QIX+hq1X0TlP7xT8UONsykCSqYWcWUViDhcyc+vib Lqn+u4MGtM7phh22k2Aat3ojIvyQcz0ZMUs3rsbj0O6J3H2GSAXCxXJaMrXiVI7dUloH yBVb/zVZbWM5ob92GiOfmHx4r0KqriuNFZGsk6oVDeoVPU+NNygRB/LxZjlhwWeec4Ap wNDg== X-Gm-Message-State: AC+VfDy/oEvOV7vGG3Ck0k9Fp6XSdhVfObVVHwg66jHNALNj9n2fJy61 PtxaVByTc42v+h8vjdFfCKg= X-Received: by 2002:aa7:d9cf:0:b0:516:459d:d913 with SMTP id v15-20020aa7d9cf000000b00516459dd913mr7305823eds.37.1687189941043; Mon, 19 Jun 2023 08:52:21 -0700 (PDT) Received: from localhost.localdomain (ip5f5abbd5.dynamic.kabel-deutschland.de. [95.90.187.213]) by smtp.gmail.com with ESMTPSA id d16-20020a056402001000b0051849ba515esm8562430edu.13.2023.06.19.08.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 08:52:20 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: philipp.g.hortmann@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH] staging: rtl8192e: remove 5G related code Date: Mon, 19 Jun 2023 17:52:03 +0200 Message-ID: <20230619155203.6039-1-straube.linux@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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,T_SCC_BODY_TEXT_LINE 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?1769147777947484717?= X-GMAIL-MSGID: =?utf-8?q?1769147777947484717?= In previous patches we removed 5G code since the hardware that uses this driver does not support 5G. There is still some 5G related code, remove it. All the removed defines are unused and we can safely remove "N-5G" from the rtllib_modes array. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann --- Compile-tested only, due to lack of hardware. drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 1 - drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 2 -- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_wx.c | 2 +- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index f4d4b01630a2..09f8c76b7e65 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -159,7 +159,6 @@ enum _RTL8192PCI_HW { WFCRC2 = 0x2f8, BW_OPMODE = 0x300, -#define BW_OPMODE_5G BIT1 #define BW_OPMODE_20MHZ BIT2 IC_VERRSION = 0x301, MSR = 0x303, diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h index 65365ebe4e85..24fb0ca539ea 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h @@ -266,7 +266,6 @@ #define b3WireAddressLength 0x400 #define b3WireRFPowerDown 0x1 /*#define bHWSISelect 0x8 */ -#define b5GPAPEPolarity 0x40000000 #define b2GPAPEPolarity 0x80000000 #define bRFSW_TxDefaultAnt 0x3 #define bRFSW_TxOptionAnt 0x30 @@ -284,7 +283,6 @@ #define bRFSI_ANTSW 0x100 #define bRFSI_ANTSWB 0x200 #define bRFSI_PAPE 0x400 -#define bRFSI_PAPE5G 0x800 #define bBandSelect 0x1 #define bHTSIG2_GI 0x80 #define bHTSIG2_Smoothing 0x01 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index dbf78b60dd78..e3ce4431d460 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -427,7 +427,6 @@ enum wireless_mode { WIRELESS_MODE_G = 0x04, WIRELESS_MODE_AUTO = 0x08, WIRELESS_MODE_N_24G = 0x10, - WIRELESS_MODE_N_5G = 0x20 }; #ifndef ETH_P_PAE diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c index 538cedb1dc02..e9469bfef3dd 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -19,7 +19,7 @@ #include "rtllib.h" static const char * const rtllib_modes[] = { - "a", "b", "g", "?", "N-24G", "N-5G" + "a", "b", "g", "?", "N-24G" }; #define MAX_CUSTOM_LEN 64