From patchwork Sat Mar 25 13:28:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Straube X-Patchwork-Id: 74907 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp412112vqo; Sat, 25 Mar 2023 06:34:13 -0700 (PDT) X-Google-Smtp-Source: AKy350ZBHZEKUPZFspqz7k+BQ41bBWRYXDRcJ1Nsd9bSWxGmXj1BOgx0bM3PHq/OMl+38ukofSJ5 X-Received: by 2002:a17:907:a46:b0:93f:9ef3:945b with SMTP id be6-20020a1709070a4600b0093f9ef3945bmr1435285ejc.17.1679751252759; Sat, 25 Mar 2023 06:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679751252; cv=none; d=google.com; s=arc-20160816; b=H2aoDYMBkdO1gWbejwCPUcd32MZRnrNKDjGIdbkaNK9HVa9fmzvRE6nmUoKIIyiYOa doPmHosRIeWgBuEhkLOw8u5Sl7cWKqBGLAm684VLjFAh4WEqAjstcuCRKjgb6mIcnHKr fhcnx6IVGeTiUIq6oLhCjFqE1qH1p8Hqre4FrOHV9SAw35fb838L1hZTdTnaio8kJO8j ReT5zUbCam1TKKjm4aaxu40+gIGdDw3jY70lKX5usyhXoKE3rOLqce1K+tEl6ED1+VL3 CLlA7M5d4UTFYzsQLk9pcc9fXJeQXOqIJQehXaHOhMKKVL7gUk7zyivgCOFMUqjdWolL /WQw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NB6p6J+61ZEfKF2taGIVauzNoOXReRV6sQgPw6xQeQ8=; b=vYJhZffXqBxEJzH9TCG6//xoN1hfBjebqGy7k7zKkzo1pain8n7QljyLZWl/E7cn1/ /AAb1TPtQz/P3FC4ZHB026fQF3Knm11Tqi7dUe7Qswd9aIKVTqOXHX2V7AcNXL+KBlb2 tzLBFJELP6iFy9tAQnrNvxbatGAMH98vaNbJKd8XHSmxea5nTO1tsUppGS21Pqpwdzye y3lBJ+9lftGsXfhzqJscAWIBfjZGlPNxoG6u9RAqhZB3GBRbMIHLj5twA4ifAZxoIWVD TvvHjiyMdQklFEkDs/VciZotQcvrhLokIt/NcVOsa734V4MDDwHEjun1uWbQaJnSEbOS Dx9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IRoQcHNx; 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 h11-20020a170906584b00b008d70b974e03si21593541ejs.379.2023.03.25.06.33.49; Sat, 25 Mar 2023 06:34:12 -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=IRoQcHNx; 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 S231840AbjCYN2k (ORCPT + 99 others); Sat, 25 Mar 2023 09:28:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230062AbjCYN2h (ORCPT ); Sat, 25 Mar 2023 09:28:37 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EC97B77D for ; Sat, 25 Mar 2023 06:28:36 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id ew6so18206404edb.7 for ; Sat, 25 Mar 2023 06:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679750915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NB6p6J+61ZEfKF2taGIVauzNoOXReRV6sQgPw6xQeQ8=; b=IRoQcHNx0zbv/J3FOdcXg2ldsaIRZ4FBlWY3Njzt6QM/1vEljPaulBm36FmTlJTvsc TCavTauqk9X6Py1MX1jsLfrRCoRQrEuYBzaDSHccPctRPwWWG4Mr8K6anRxk2uvxUXAq ZszLz3QkxZs0l3s4zdjGWV3RGqXuGqMIh6Jhq0BhzXSI8aU7qNtxm39n5LJfzNlEGnpa cmo5BDKCOIcKNeHDsEALAzXDW2UKwQvfd1QXCVYnSm7vx3TB6Mx3WaHyI8hrbHO7iFgf lRQuM22cZQMYi/EVICjuGN4FE+NVfwJMx+1ZFPZIGQaTKpvNOnEvpsgbezZYQWUDEGVr Zsmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679750915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NB6p6J+61ZEfKF2taGIVauzNoOXReRV6sQgPw6xQeQ8=; b=VvQTLqAKPzKZ3edlxztvCwW+AYw5SsaCDUJfGLnaQTMOI52ddFoFb+0gc37rR5Zv5y jYuFhkG34GgmWn6WRLT5VbfLHYTlZT8qgJOZnAmMHFPsj5VdluU2ZQAwZj0koYXmBuWz GmsfBKDQWsdscTIzgU8NB9LugwfijLHXCy2CsyfUycF0QD/qzFB7lL4LHjG/nPb1Ih+O xT/pyWQRJwVB+eAsDIyN/yhidwtASJ6DbWGxKH+BNBwb5bqDBRDhtNIXegQWaO98kBQf ia2FkbGKhsuufKDj2KMp/QUQWssFc4Q+JSRcaYGK+Q48rdbdPwzaBuWCWgwD1/Eu77Ck Ms7Q== X-Gm-Message-State: AAQBX9fsTjTpKMM+cH51BWzRMC3YYOtZg0S9AmKtKbGW2VHmhZsE/eWO A86rFEDKDPmpwfpMMfFiiKs= X-Received: by 2002:a17:907:6d27:b0:932:cfbc:7613 with SMTP id sa39-20020a1709076d2700b00932cfbc7613mr7396832ejc.24.1679750914842; Sat, 25 Mar 2023 06:28:34 -0700 (PDT) Received: from localhost.localdomain (ip5f5abbe9.dynamic.kabel-deutschland.de. [95.90.187.233]) by smtp.gmail.com with ESMTPSA id lt11-20020a170906fa8b00b008e54ac90de1sm11727610ejb.74.2023.03.25.06.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 06:28:34 -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 1/4] staging: rtl8192e: remove RTL819X_DEFAULT_RF_TYPE Date: Sat, 25 Mar 2023 14:28:20 +0100 Message-Id: <20230325132823.22872-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230325132823.22872-1-straube.linux@gmail.com> References: <20230325132823.22872-1-straube.linux@gmail.com> MIME-Version: 1.0 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?1761346849501240324?= X-GMAIL-MSGID: =?utf-8?q?1761346849501240324?= Remove RTL819X_DEFAULT_RF_TYPE and use RF_1T2R directly to make follow up patches, which will remove priv->rf_type, easier to review. Signed-off-by: Michael Straube --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index a67927f0c5e3..3027d43cb362 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -343,7 +343,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) else priv->tx_pwr_data_read_from_eeprom = false; - priv->rf_type = RTL819X_DEFAULT_RF_TYPE; + priv->rf_type = RF_1T2R; if (priv->card_8192_version > VERSION_8190_BD) { if (!priv->autoload_fail_flag) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 68ec0aeb2dd9..914cd28897a5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -61,8 +61,6 @@ #define HAL_HW_PCI_REVISION_ID_8192PCIE 0x01 #define HAL_HW_PCI_REVISION_ID_8192SE 0x10 -#define RTL819X_DEFAULT_RF_TYPE RF_1T2R - #define RTLLIB_WATCH_DOG_TIME 2000 #define MAX_DEV_ADDR_SIZE 8 /*support till 64 bit bus width OS*/