From patchwork Sat Mar 25 08:35:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp285920vqo; Sat, 25 Mar 2023 01:52:54 -0700 (PDT) X-Google-Smtp-Source: AK7set+F5IXhu8yCOveHWWmUzIEnQo7VdgNIwMEw7JSQwbMEoZO6ujVD7ago9uHEMK1qYBd4T7m3 X-Received: by 2002:a05:6a00:3117:b0:625:524b:9712 with SMTP id bi23-20020a056a00311700b00625524b9712mr9727023pfb.2.1679734374072; Sat, 25 Mar 2023 01:52:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679734374; cv=none; d=google.com; s=arc-20160816; b=OuO9v+5g5ILETn05SN6Y2d5l2lcWPk8BeuHaKae5K4C+Cvfv+5L+L9oiT05l+xCjMn QK32OOjIRFlMvG5h8TtQgqZp/i5uYnv8H5vJqCr/E1hryZczMQur2wMI02W+3VFgDUG5 OVt1rFjmARu8f8UOdHAC0G8mfZr7egoxT8Cs5Dhjebf7mIk5F/KOSMIjUQ/rkpEAVoh+ QF8Zfe0eBY8EtyhpiNC2m2Ig45bhqVTAilFpeUBP5zqB+ay3jvmxF/4ysazYgxPYQefI IhhS+X9vw61aVSRD6ABlSk4okm6T3btHY3ok8UoVrtYBWPw13hFPoPP6pIylEF89dY3s jooQ== 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=UcQDl4D7QfpTg14fckybYa1gutFz2rlct5Mc7Ooqxbw=; b=mYnVWl2mRaPzcM+NzzNk4Odw5Y5cmLttgwZiYgm+BeYR0UJXN/xG/i8TQ6BbsNIATs fllqrB3HLxP9M+vH/taESh2uVRKO2tilYoXP54R+WTkqLyWc5SbRhxHYBThsJDtUR2R6 kKhUgwo8tpcvoUc03D8TUWV0FCTujXZmNbG9aed81594yjayN5tinguEehZJBdPCubIL gaoZcr28Ve42Mo+X2obqwMLiJ5q87fq7uXq6IRQCr0sDGHKxx6YSz9KTJVDuXFCjjc4R 6B6VF3TyRv8Vj9ThH+V9HOeUCXfGBpM045thIqT4QbGeMj3YtCcYNZdI3+5cJb98sP2O tJHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YGvZ3CA0; 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 q3-20020a056a00088300b005808bb470a0si22888243pfj.180.2023.03.25.01.52.41; Sat, 25 Mar 2023 01:52:54 -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=YGvZ3CA0; 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 S231880AbjCYIfd (ORCPT + 99 others); Sat, 25 Mar 2023 04:35:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232098AbjCYIfS (ORCPT ); Sat, 25 Mar 2023 04:35:18 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94C2F14983 for ; Sat, 25 Mar 2023 01:35:17 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id u11-20020a05600c19cb00b003edcc414997so2212113wmq.3 for ; Sat, 25 Mar 2023 01:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733316; 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=UcQDl4D7QfpTg14fckybYa1gutFz2rlct5Mc7Ooqxbw=; b=YGvZ3CA0eLxSSJSxywKE1QEe4oOYAn4vDg+RM3MNiVaBaU84ypAF7SQVuUbLp5kwnB o5nbuE475eZg93Euh1SbCBAM/ftpS9twznrossXRMtTy23g6wdno8ojEmC8mVmG2aYDr x3D8IkQaIl/iTBmJWPXL6z75gi4jXmHO9cfyFH0sZvgF6Fcb9d/wG2yT+Hm0CSfaLKwD UA1a5aK19ppdgZXx552E1k8dIrrayRo4iNywoS+SH7I+FzwBFlkHe1CNjQ478K9HZI75 160ARPVfY01NmUMPm546nGw8tYeCTnLDjPvZp3yEBr99fB4oZjkMo5ENX5cQhPqGA7aB K7Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733316; 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=UcQDl4D7QfpTg14fckybYa1gutFz2rlct5Mc7Ooqxbw=; b=4KZVAGMM2Ly1+LntZrGCVxQQ+iFX6tbgurerga+x8tq4du/paZTRANGHNy4mjylxyV HVs/TtEgNG7E7s3LTmDZSzhv/G1jYMC/e9sTUemswJZlyoZDLFSBBgRXbzHAAZ4zZlmr 8RFJuLcyHba5sKKVJ87xHUa6rrCB1mxLtvsTgoI8hXvKXGxfgugGZFKJO4J/y04cB5uB X+nbcCnUFJkB/OoZQ890B1Y1yNMP51NRZQpcJf8dwfFj1j4PZGLEAM5JZ5h6Rg87rQ/J mnimB8anM76feliZEGQeUw1zNZUoKyjzDO3k0aJ57YvXvo7suAry7NgcMu1nwQaQ6x8e POWA== X-Gm-Message-State: AO0yUKX+r3pPQfn3CcTT9cGSRoGAjvJSj06cp2VG9LlRxm4JJqB3Fy3R 04kLBcek3htuelfA0MygTLVlIa8yCHY= X-Received: by 2002:a05:600c:4fc1:b0:3ed:2a41:8529 with SMTP id o1-20020a05600c4fc100b003ed2a418529mr4280480wmq.2.1679733316019; Sat, 25 Mar 2023 01:35:16 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id o15-20020a1c750f000000b003ee1acdb036sm7223202wmc.17.2023.03.25.01.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:35:15 -0700 (PDT) Date: Sat, 25 Mar 2023 09:35:13 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_rf_read 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?1761329151069185491?= X-GMAIL-MSGID: =?utf-8?q?1761329151069185491?= priv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_phy_rf_read as those are dead code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 2dbddf4ae3d6..c4fd412cf3d6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -82,24 +82,20 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, Offset &= 0x3f; - if (priv->rf_chip == RF_8256) { - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0xf00, 0x0); - if (Offset >= 31) { - priv->rf_reg_0value[eRFPath] |= 0x140; - rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] << 16)); - NewOffset = Offset - 30; - } else if (Offset >= 16) { - priv->rf_reg_0value[eRFPath] |= 0x100; - priv->rf_reg_0value[eRFPath] &= (~0x40); - rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] << 16)); - - NewOffset = Offset - 15; - } else - NewOffset = Offset; + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0xf00, 0x0); + if (Offset >= 31) { + priv->rf_reg_0value[eRFPath] |= 0x140; + rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] << 16)); + NewOffset = Offset - 30; + } else if (Offset >= 16) { + priv->rf_reg_0value[eRFPath] |= 0x100; + priv->rf_reg_0value[eRFPath] &= (~0x40); + rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] << 16)); + NewOffset = Offset - 15; } else { NewOffset = Offset; } @@ -113,15 +109,12 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, ret = rtl92e_get_bb_reg(dev, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); - if (priv->rf_chip == RF_8256) { - priv->rf_reg_0value[eRFPath] &= 0xebf; - - rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->rf_reg_0value[eRFPath] << 16)); + priv->rf_reg_0value[eRFPath] &= 0xebf; - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); - } + rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, + (priv->rf_reg_0value[eRFPath] << 16)); + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); return ret; From patchwork Sat Mar 25 08:35:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp297337vqo; Sat, 25 Mar 2023 02:21:34 -0700 (PDT) X-Google-Smtp-Source: AK7set8FhsLvoxK2tEVpIcXFn/Gyb7ThazBaI5gcMoGCslr+5imyB7YZ1y97VDg/RBcBK4hH1ZdM X-Received: by 2002:a05:6a00:338f:b0:627:f40a:fd35 with SMTP id cm15-20020a056a00338f00b00627f40afd35mr11738087pfb.10.1679736093772; Sat, 25 Mar 2023 02:21:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679736093; cv=none; d=google.com; s=arc-20160816; b=OMdPcSXv8ZDfL0twktrzJog7o9vHibTu1jMoWfP6GfxE1hDr7QhG0IqlUPWABgTEPC XtbUTqR+mMe9kN8o9M5raOVOKHRwORJaBOwBpygsl0ct3lDQ3V9NwiREahZ091vSDwi0 9ntvTlaDedeqMom/OmlRo8JUazCcE8LadYH8sp1J5prBU6fZKq7Gcp+JGineCUnvytRh XPEtygiD+uMb7FPfUaCnWJIGuyqdYGTPDnZyBghUDxJ+TtZQx1uNsrBeegy6PM6hMWhI mD89d1UNzbyTQslui7/3rw16+qKxWiSFpYj0cFzYsf85VRMjO7GMf/Bvhg+KiniMkMNg fTJQ== 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=jtF6AKurBTM+JKZ/Gr3b6r0bPCKeZarTQibx8Hu6cr8=; b=MIfIj2H4pgZezjBP30zN2BMhR3y5DFyRbz26n1BuxRjQvFs53uV+Z+uF2oGdqyynuN 4jm8spcitZXasNZh2ovUEv63x7Sy+/UHw0+1JZxvs+m3HQqXF0kG+reohyTX5+9GWGfc xbJXto5uEuEsOgTpuSG4KbPHLw9wgXvuS+uny0Tf04UTNgT+GZsQVtllu4mPwen4DvTh EiXEzfKFbGwTCtQ3UgZRNs3ALDuini8IQ+OP550eLRnMMZdGjLHOP4BNXkxN1x9DVr+b bNv1INrrnaffZLLSIkmOfYHeGcPDQABLRz8RX54kaDxkBdW3a4dKzh5/r+XvQRG57cFr gu3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mCmYVGja; 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 fc34-20020a056a002e2200b005924b9f5b9dsi24285094pfb.333.2023.03.25.02.21.21; Sat, 25 Mar 2023 02:21: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=mCmYVGja; 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 S232191AbjCYIfv (ORCPT + 99 others); Sat, 25 Mar 2023 04:35:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232122AbjCYIfi (ORCPT ); Sat, 25 Mar 2023 04:35:38 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEFD818174 for ; Sat, 25 Mar 2023 01:35:32 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id r29so3848765wra.13 for ; Sat, 25 Mar 2023 01:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733331; x=1682325331; 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=jtF6AKurBTM+JKZ/Gr3b6r0bPCKeZarTQibx8Hu6cr8=; b=mCmYVGja+bfDuj6JPK5LDBpQhwzHI9yyNlpIWbzdx1oBXQg/fiEIGfHvT0OGkz4l56 dkXamSHJsNBNw5m5TtptIlc9HOkGGRC2B5C4oMa6b0uWqh3OwecuZWaRGTP28uEYW+xU urwGHPOvYAsQCOCbcfdVWfJa6yVDSovUQkrpo2iWx7YbLbSjowoNRDAs2EkdxrIaHF/I Q3rnZ0DBwRn9XX7hMslY9ADSlAnQPG82RCMTLTsO1FAa/6g6kz1sfNW5XUaena9k3OIZ SH7FO6kn6kb4fsaF9PDKsKG64FkHbx0sk/bXghrAycXYrRWANKzY4J4rBos3avPmPXef nCAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733331; x=1682325331; 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=jtF6AKurBTM+JKZ/Gr3b6r0bPCKeZarTQibx8Hu6cr8=; b=b5eH+1V8c0KBa0v1TODz8I2vxCWP58KLM8y5XzKnmOTHMACdYfwgqUgIctN816WK4T qiLq+a8rN+bkX5k+bw/Jn27IU6XY9B69Uwr2Bds1N63kS+4yitcfRON0sHKxmrRzukJR BvTOCoin/0WC9NyWQ/4r7fekkEB6IjKRJ2jfsAP2i7GxvFgeVOK+3uKbuhiR/PEOqDEh xQcfrjIlpttT4IgpGeUzaIv0uJhhaeaMzMIKBWRZW92i7jOgAL5mycKGODv3ZILljfr7 WF75pZM6GWAr7UIdIGbplDLF9RqQhAtZNGqak/j0ReycgAYrEKl/r+zs2EcCjguBjn0U pBRQ== X-Gm-Message-State: AAQBX9dUREktiUBVYIKzVaPSsxzupiTP+QlHGpMTkgRdEX/s1gjRI8GC f8JFV3wxm419a+r4v2oOXdQEjZmTmT0= X-Received: by 2002:a5d:4d88:0:b0:2c7:1c72:69ac with SMTP id b8-20020a5d4d88000000b002c71c7269acmr3220509wru.2.1679733330992; Sat, 25 Mar 2023 01:35:30 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id k10-20020a5d6e8a000000b002d1daafea30sm20102657wrz.34.2023.03.25.01.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:35:30 -0700 (PDT) Date: Sat, 25 Mar 2023 09:35:28 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_rf_write Message-ID: <77628b7ecade212401d7da5e3c0b79f8ef55b5c1.1679732276.git.philipp.g.hortmann@gmail.com> 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?1761330954355698710?= X-GMAIL-MSGID: =?utf-8?q?1761330954355698710?= priv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_phy_rf_write as those are dead code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index c4fd412cf3d6..acd1e1869d78 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -129,24 +129,22 @@ static void _rtl92e_phy_rf_write(struct net_device *dev, struct bb_reg_definition *pPhyReg = &priv->phy_reg_def[eRFPath]; Offset &= 0x3f; - if (priv->rf_chip == RF_8256) { - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0xf00, 0x0); - if (Offset >= 31) { - priv->rf_reg_0value[eRFPath] |= 0x140; - rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] << 16)); - NewOffset = Offset - 30; - } else if (Offset >= 16) { - priv->rf_reg_0value[eRFPath] |= 0x100; - priv->rf_reg_0value[eRFPath] &= (~0x40); - rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] << 16)); - NewOffset = Offset - 15; - } else - NewOffset = Offset; + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0xf00, 0x0); + + if (Offset >= 31) { + priv->rf_reg_0value[eRFPath] |= 0x140; + rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] << 16)); + NewOffset = Offset - 30; + } else if (Offset >= 16) { + priv->rf_reg_0value[eRFPath] |= 0x100; + priv->rf_reg_0value[eRFPath] &= (~0x40); + rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] << 16)); + NewOffset = Offset - 15; } else { NewOffset = Offset; } @@ -158,15 +156,13 @@ static void _rtl92e_phy_rf_write(struct net_device *dev, if (Offset == 0x0) priv->rf_reg_0value[eRFPath] = Data; - if (priv->rf_chip == RF_8256) { - if (Offset != 0) { - priv->rf_reg_0value[eRFPath] &= 0xebf; - rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] << 16)); - } - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); + if (Offset != 0) { + priv->rf_reg_0value[eRFPath] &= 0xebf; + rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] << 16)); } + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); } void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, From patchwork Sat Mar 25 08:35:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp293343vqo; Sat, 25 Mar 2023 02:10:58 -0700 (PDT) X-Google-Smtp-Source: AKy350ZguDQR1XgTL74W2/+3gRJqsoI1vdcQvgIfg37SeE8Kz+pZa+ytF4jyuRgpdM9/2DC3g1pg X-Received: by 2002:aa7:991e:0:b0:625:d9ec:51c8 with SMTP id z30-20020aa7991e000000b00625d9ec51c8mr5319257pff.22.1679735458231; Sat, 25 Mar 2023 02:10:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679735458; cv=none; d=google.com; s=arc-20160816; b=rz9A3UZoQwxm/ZZ2jUWhhKurm92kXpbwz+8e6J2TewTZWoj5Vceu6mPHyVBFxgKsmx e9iTnOexXmSWXhIq4vWt1VE0px7rVkOUccmSGQsU+c/rI5WK2nczQeOambK/eFkJljyF YnNvdQvwUoSxXgM1Fnz19/Z53fDfFr4DnP30pN4823y9ycn6RIzVqYZjqDoDE5cjsHti ga4Rp7ayJiSaK7PEaMN7La4+TyZNiEp+7Xc3QBhyA4VC/Ql1gYI9xQeOL/Msu7gqOJq6 4AyNWLfot92B/swJ+fBL097WvhX215CVRU9mq/XEEb16NcymU8zt6rvgBEIRrsGvd65+ pbkA== 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=OtIYOlrEQ6ezmFUmDEHNM3uU5E+lWona9mVF/nvcfZ8=; b=bSdv71y+jwF+s3yFKwsCf7ktYPOOE9qKajgOyF+qtO9uMt8gwBugjIOfPyShvRZYvo Kyx6Me06AAWllTdgd+rqq+L6zl957Zdk6nL1p1UtKjbaPldfQ7GzDYGVIZZVOclcfvtv VY1Um0k+haGpZkKMkyVozOjYhR+Kg3tl8yNrfRdRxQ2KiRV/3sazOjDHb90joODIA8F6 xw7IHb4lcdgJ4fHwkrworksKM39itUloRiPTnROkVqWNyifypTt5DF7CHRRjPnILDn1s QJuQKQfvnRgEEu1ZxUfD02TT9+xMkCWIY6Ymwr+XpdNF0tDA/D9CbE/JUVWkfVmhSHVM aNcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dlCMbDJF; 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 z186-20020a6265c3000000b005a8bd21e2f7si21422763pfb.186.2023.03.25.02.10.45; Sat, 25 Mar 2023 02:10:58 -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=dlCMbDJF; 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 S232152AbjCYIgK (ORCPT + 99 others); Sat, 25 Mar 2023 04:36:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232153AbjCYIfz (ORCPT ); Sat, 25 Mar 2023 04:35:55 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDE7918B00 for ; Sat, 25 Mar 2023 01:35:48 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id b20so16614516edd.1 for ; Sat, 25 Mar 2023 01:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733347; x=1682325347; 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=OtIYOlrEQ6ezmFUmDEHNM3uU5E+lWona9mVF/nvcfZ8=; b=dlCMbDJFvAx5eJsoyWDnb8bGX9oUMgTZX/0FamcM+s9vtXAFihUgrJah6WDD3LKRyy kzGa6PRSs1Tk6fKaH69zeKiodA5uqR2BoCyAgsCr/LuAGys4fnrwRPXcicr1yijNkLIJ TgCMHq7sZBNgibwQ+YU0uaWF3HOGmau//FWI2AfPkJNMrNAUGNMObVSFeaw41ysHlvRW TRr3iaeKSlSK6+cCbHhXbqqO7VjiEetFD9sK4+GJyQMqzag6DQp/24tBXPQof8t6kReZ 6EWxsw02e1vWRB3LnQppnbu12Fmh6f16RlSWWD9DIRt6tgkDVTW7irEN5oFlQB++iFTL NTLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733347; x=1682325347; 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=OtIYOlrEQ6ezmFUmDEHNM3uU5E+lWona9mVF/nvcfZ8=; b=e+C1JPm64G+wURWO/GfYqoE++J+71UuYkIbRbI42x+jNVTqvZgpd4pPoXM0l8laNuw 3lsvJt+NxJuW7rcHCWcky/Cgnr5NLp9UvGS8/WJc8T3LCB+NWcfcv332mBML0fzzbDpD SxlQqlsOjFf7Ypr1AvoqQUClKni76b8YQ0xJ14FWI1r31NrWUUk8++FQeqGajT6dkAhR 3YDS1EOXVt0JSmbwC8GbBQdNnYx4XtvaYZmRY0+wNs03aOcmCI8xfGY4ysmlRWRtiISU xr8QmAKo6yF6UOnf20YO1SUG5EDRYaj51WfKveWuMR4UU+V37LbSFGMbq8gncQ8GD7UU Ql6w== X-Gm-Message-State: AAQBX9eo73Rkwl05JhQajqB2E601/W3ZCIh69YZ2vbGiICNJ4Gv2kpen V7cWesNhl+2TAe0r7CC6SfY/gjFAu88= X-Received: by 2002:a17:906:209e:b0:8d3:be84:1cc6 with SMTP id 30-20020a170906209e00b008d3be841cc6mr4172218ejq.3.1679733347206; Sat, 25 Mar 2023 01:35:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id qb16-20020a1709077e9000b0093f3d41b9ebsm683134ejc.220.2023.03.25.01.35.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:35:46 -0700 (PDT) Date: Sat, 25 Mar 2023 09:35:45 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] staging: rtl8192e: Remove priv->rf_chip in rtl92e_set_tx_power Message-ID: <190d0a77602cb89bc24512c99b72f25f4ca5d5e2.1679732276.git.philipp.g.hortmann@gmail.com> 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?1761330287560065422?= X-GMAIL-MSGID: =?utf-8?q?1761330287560065422?= priv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function rtl92e_set_tx_power as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index acd1e1869d78..6579c7b81bfd 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -485,19 +485,8 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; } - switch (priv->rf_chip) { - case RF_8225: - break; - case RF_8256: - rtl92e_set_cck_tx_power(dev, powerlevel); - rtl92e_set_ofdm_tx_power(dev, powerlevelOFDM24G); - break; - case RF_8258: - break; - default: - netdev_err(dev, "Invalid RF Chip ID.\n"); - break; - } + rtl92e_set_cck_tx_power(dev, powerlevel); + rtl92e_set_ofdm_tx_power(dev, powerlevelOFDM24G); } bool rtl92e_config_phy(struct net_device *dev) From patchwork Sat Mar 25 08:36:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp284855vqo; Sat, 25 Mar 2023 01:49:21 -0700 (PDT) X-Google-Smtp-Source: AKy350ZcK7YWkCZFAulzBViSAOOR75p2fOqIKUXj9CqOAJjhv72HzI6FbpGLIcDrNeNGRhOg3A6K X-Received: by 2002:aa7:d8ce:0:b0:4fd:2127:a8bc with SMTP id k14-20020aa7d8ce000000b004fd2127a8bcmr5814289eds.29.1679734160803; Sat, 25 Mar 2023 01:49:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679734160; cv=none; d=google.com; s=arc-20160816; b=By5UsKSowzkySNoe1z5QwR2mpxidJjbwqLfACTVl9Duv9nPFYDE3Bk1g1X4J239ERp Zh+2Nwfft69GGa3jcN0kMdwvP41cX7N5qiz0pTD0wWNV/HWTO5imst/PW4hipT/Rq5U6 6CAlfRV1s7lOQYiYdMaUG1D394T6IDZ0Ho03a3vFrUcQLksbfNizdQWHlDDqx1MCJpHT nuNWILK/G4nBHKkPWDhsuOZ/6KpVeLKQynoTnD0zOXoieUpyD/okyPf6IgowIYXNHHvK DMgmcSvN9mao1yc2ZQdwc8a+7FJ7z6s7m+8Ht7WclL7d9HmXmeHlUEI/er9RyU6gy2pp qPAQ== 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=dc8fh90KbqBXiSamQ6fXKYW6QBeBG1tBvztL+KlOiwQ=; b=yPcc77fCjBOjxECP37mRk7OTuGYACJNC07vOMVmNnaVAHjCcr2E1gPqU1sWVzJrbAH UcK92vp9KLC5cgS9sJgN9yeIQX/SoFamxbM4G5agdZsgOxp89uj1YrQE1QYe+xvFnYQU 291TRr02y5453BgjfnWw+eJr2Azn+OgFwU9xs4kFpZ6A6Jc47G6qEVI7lZeKHFsV9SmR xgFKhD3+cRH24zrqBDgYRG2QCvvaRbgTaAruSrFHpXLHtqSFrZWWgU2g2VE3dKVJHkVA lhF1Z94ZDMeUOmu6/0QMHoTMhRN9XuxY4G9Hz77IxDsLGcvScy2FQESAK6SP0F5akPBv rFEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=opPGtoK1; 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 r19-20020aa7d593000000b004fadb35d2ddsi24390813edq.431.2023.03.25.01.48.57; Sat, 25 Mar 2023 01:49:20 -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=opPGtoK1; 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 S232221AbjCYIg0 (ORCPT + 99 others); Sat, 25 Mar 2023 04:36:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232147AbjCYIgJ (ORCPT ); Sat, 25 Mar 2023 04:36:09 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 343BE18AB6 for ; Sat, 25 Mar 2023 01:36:04 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id ew6so16478161edb.7 for ; Sat, 25 Mar 2023 01:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733362; 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=dc8fh90KbqBXiSamQ6fXKYW6QBeBG1tBvztL+KlOiwQ=; b=opPGtoK1ZjhdTj4xeZNlU8az/JqYZ0c0T3Kqnlu5mzLAB6A+8TgqpzNBRFdFy+OX2J Xv7eWBWQWIzQggVobHI4TeDcsfuu8/9EZ5TzIgXhOSOCgjN7ZUvxi1YuFYrxCdhn+kKt oxeAzyytXgEcSOTaGkW1aZ/qLe4VM32x/EilKO+YQgCDYtsllsNMNPXe8fGd78HrMAQ7 IO7ztMd8Y0rvH73VavPpqKGQJBOzB3SPywZ69bZF/T5kiuMdQcyX2z1xsfT2pQgour9B lKPJ3HwK2gCCvSxT1lPB7yKL/xOuPo+xqZelWRX8PTc7BzpE8Lg9csstHmOqA0ujLtUH /99w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733362; 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=dc8fh90KbqBXiSamQ6fXKYW6QBeBG1tBvztL+KlOiwQ=; b=5l/k+SdoFaVEP8Nrk1EuJAPfoGjroAQdWqf6/0I8ZES57X2DkDJhrCtTjGlrbzR6kb FFFF8K/4ZkHgq+ZlVEe6WP1j6qhb/GX4+m4Cu30tzXJQLm/0TuEj8Hc9EDzgX+Eyj4dY X88wPtyUTxxr0gMjbnHKQLSO6hh6sTqHZojHUiDhMOBULdwnSPYFyCYN9/LZJQw88XfG Fz9vvAcRxq1SheuQrRlkm0A+vSW1Zg3J05xNs0tf1D/h1ds0LyRdhxJZ70hJteelixnX y6gFDH7+P2ku8yl3076lsAyt8KNzV5majm/VoKQPU+0MQFU1bT4tnCizPMKipSoiFPS2 aMvw== X-Gm-Message-State: AAQBX9ex/8hJemjAOxvcGxFsFUGY3BE1JH/tQXWYOOT0FLrndZ8ICb6r 4EGjURJFCLGVSdTFV5BWwQM= X-Received: by 2002:a17:906:74ca:b0:8b1:2614:dea6 with SMTP id z10-20020a17090674ca00b008b12614dea6mr5107443ejl.1.1679733362676; Sat, 25 Mar 2023 01:36:02 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id c3-20020a170906340300b0092fc6971000sm11387480ejb.40.2023.03.25.01.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:36:02 -0700 (PDT) Date: Sat, 25 Mar 2023 09:36:00 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] staging: rtl8192e: Remove priv->rf_chip in rtl92e_config_phy 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?1761328927014464473?= X-GMAIL-MSGID: =?utf-8?q?1761328927014464473?= priv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function rtl92e_config_phy as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 6579c7b81bfd..e35085253e70 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -491,25 +491,10 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) bool rtl92e_config_phy(struct net_device *dev) { - struct r8192_priv *priv = rtllib_priv(dev); bool rtStatus = true; - switch (priv->rf_chip) { - case RF_8225: - break; - case RF_8256: - rtStatus = rtl92e_config_rf(dev); - break; - - case RF_8258: - break; - case RF_PSEUDO_11N: - break; + rtStatus = rtl92e_config_rf(dev); - default: - netdev_err(dev, "Invalid RF Chip ID.\n"); - break; - } return rtStatus; } From patchwork Sat Mar 25 08:36:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp295964vqo; Sat, 25 Mar 2023 02:17:32 -0700 (PDT) X-Google-Smtp-Source: AKy350YT/bSoIo+7cgfHJgFyy36lb57KA8CiKwa7aIjylNWn7Fqae1qpKiwVO6JdnhV2wNoMwtnQ X-Received: by 2002:a62:84c1:0:b0:628:134a:863 with SMTP id k184-20020a6284c1000000b00628134a0863mr6557420pfd.29.1679735851744; Sat, 25 Mar 2023 02:17:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679735851; cv=none; d=google.com; s=arc-20160816; b=k0KBkbrQA3mE7uWQdk+VT8lEBlyQ84jYdBhdjDPyuA3uqpHOOsutrOBZC104q2jiug u1Be9+JU9ls8kdfhsoDgicQn6HB62YDnF61hQpeSh4uQyXjSGrp3EUVvDTxKucCPuLhw VVRe5Cq3BktlE9Y02eCB9Z0rKeYnO0HGcTcwOfyOn/za2fANE3mzZPNPDFNT7YYH2L4N 9TASqDvkqqA3CraNkIdIYjvxDj5+PssYtT6yphyWRZLyiCesfndaVwOvIyiGlQ2jq31w P8fZ6+9SAnSb9JFqRyY8b1fLyTtKiV8ponBmP26Zlc9zUxO4MBrJPEv0MMDQvTSP+GEZ YjQg== 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=tXY6VvxPrL+Ft/OOHN7tVol0Ou3qPIGP5Ichat9gkls=; b=iXAPHlTiqOZ3M1HejuRITKihxerUIdymh0utt5RPxwBCWqVOwEOZ36ukP2NV4tW6/u B4C8okKOz8iPMYp987n8WIo8syv7Lm+RuFrLgKknwdeneQuUwS0+w6H6ad+6H9tWVA6t ZMEhfwP9FD23YD6CZqWLwQw6iW5eQF/Zv2L84il7/Y9E0BLw25dMcEHU8Zs34pWC8wrq nxvcVTo0QJUEbJXMsoj/ZX+Zu7vdrxxWA6sMGF15VglRWLVC5ex37LUswvD4neTnJGUa cEMRwseQ2y9/hH4q8aKHA9jUnlQSirlz0b4hv2tYJqPQtqlWmBXvCrnDekUlEWfVzLnA t9aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nZkUzNJP; 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 k2-20020aa788c2000000b00627f0afab65si17665845pff.150.2023.03.25.02.17.19; Sat, 25 Mar 2023 02:17:31 -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=nZkUzNJP; 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 S232159AbjCYIgg (ORCPT + 99 others); Sat, 25 Mar 2023 04:36:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232220AbjCYIgS (ORCPT ); Sat, 25 Mar 2023 04:36:18 -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 3BA2B18AAD for ; Sat, 25 Mar 2023 01:36:17 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-93075ee221bso14102466b.0 for ; Sat, 25 Mar 2023 01:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733375; 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=tXY6VvxPrL+Ft/OOHN7tVol0Ou3qPIGP5Ichat9gkls=; b=nZkUzNJPqrM3dg8D4xEm8V8C0pb+1R4E2r4qfWzkxHrtVfCZGNmLdoh5Om3KkvgJJf Ip9sTS8eIjIP0tWwcsGNhqVNtFRgvp7Wq2aEU1CEBWQtC+aPAsoGvaaInsstki7e4bkH lOECU1WDjnWbyvpF6r/ZThUcwZVVh0Y0G7BaoAHYaKluRp70yHL9RSicM4ozbx9pAdfs CPTw0ugCy3Pg0386U7dbU/Q2jmBSN+aLgT2qH8Av9/SFcj8rqAnUL79fzz5tXguGVdi4 EbruRtt/WjOnl0tWRqucRQ/2svhPARFz7XHDFwkMHMxmfTfrRXy3ESIF5Qn+bxfLlfKh auVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733375; 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=tXY6VvxPrL+Ft/OOHN7tVol0Ou3qPIGP5Ichat9gkls=; b=oMxw7FV/C5apnBgrZCWpTS0xODt98WqKKej5tTl6YjBvGUndatAYV2WC45QBYNdjug DzjHwUDJzJzrziQd3BKeRw+dvZIQKT7mqfbg/OeJ0ErOBgeTuLWRqAx+OFCw9ymxXc6p CNNIZjBj05EfhPIHHbYa1GdAq9Q9e7SKI4iYfA43kIqn5SEm9/Jahu+Nv5mjCrnMB9jk dUvm00qZ2itl9Y3itCbhFBqCAiSLgFvttjAUGOkxopOUdhNJD9j2waLEjD6AyDvoDFsS P40l8Lalyf583vPeFc3OuDwvaYI1SP6kZsgvQ7VCgyQ1ucSGjyWtmyevdaKAKydrWbDE Whjg== X-Gm-Message-State: AAQBX9es8Xfkno6btHTyJS+zqdDPn7jf4teHuk+BI1jFvZPvUPzrbp5o OSZt4HS3ecu9SwdzZFId8fc= X-Received: by 2002:a17:906:2083:b0:92c:fc0:b229 with SMTP id 3-20020a170906208300b0092c0fc0b229mr4620756ejq.0.1679733375776; Sat, 25 Mar 2023 01:36:15 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id by22-20020a170906a2d600b008cecb8f374asm11389751ejb.0.2023.03.25.01.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:36:15 -0700 (PDT) Date: Sat, 25 Mar 2023 09:36:13 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_tx_power_level Message-ID: <465a789243287c1420fdce68f9a861784a164140.1679732276.git.philipp.g.hortmann@gmail.com> 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?1761330700318201915?= X-GMAIL-MSGID: =?utf-8?q?1761330700318201915?= priv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_set_tx_power_level as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index e35085253e70..b528b8ab4b2b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -542,21 +542,8 @@ static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel) u8 powerlevel = priv->tx_pwr_level_cck[channel - 1]; u8 powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; - switch (priv->rf_chip) { - case RF_8225: - break; - - case RF_8256: - rtl92e_set_cck_tx_power(dev, powerlevel); - rtl92e_set_ofdm_tx_power(dev, powerlevelOFDM24G); - break; - - case RF_8258: - break; - default: - netdev_warn(dev, "%s(): Invalid RF Chip ID\n", __func__); - break; - } + rtl92e_set_cck_tx_power(dev, powerlevel); + rtl92e_set_ofdm_tx_power(dev, powerlevelOFDM24G); } static u8 _rtl92e_phy_set_sw_chnl_cmd_array(struct net_device *dev, From patchwork Sat Mar 25 08:36:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp291420vqo; Sat, 25 Mar 2023 02:06:25 -0700 (PDT) X-Google-Smtp-Source: AKy350al/NEtL/iKsqGUNCXR+ryw5OH+VVo8VuXTM11xBPBrihdOotzmuLsXCwA+TybPfUyvsTAo X-Received: by 2002:a17:90a:1953:b0:23f:7196:2faf with SMTP id 19-20020a17090a195300b0023f71962fafmr6113329pjh.19.1679735184866; Sat, 25 Mar 2023 02:06:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679735184; cv=none; d=google.com; s=arc-20160816; b=mTruoY1mjTUXcrVkoe9K1oMHMNmw7CLoWUGtKATEISQ/CXkEiR6wIcfhuG2mTENzMc 1M0Gt+YH+Y6EzfS0NZ3L7dyfipc2YbMDqT0q3nr4U1ik6gdHCO06U1IlULImdGr3/DLE Nk4ztWiXOgxoxhIp5BNxyS9hOIWJvHP59r/9z8gMKIsjLZ1J8TpU+gy1nHSdlF8ZAbnC gRv5WyzcQ79dFR/Log/ZERlvgkaz5U4uP8vDFlUcCcw8ZkrMeDSb9I+dbJ6JWMvs0NrE 8xGpCd2cmRl07jPVAknPif1vp8lLJOMT1oztaBmCDwcToRxkdOF5Fx+aZJvW2lptfrV9 cinQ== 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=pego/p9EbPQyvAXkY7L5ybuHyA9HZAjsDB9bAcQ4kms=; b=rqHdEZ3JIknHik4OEj+ERhAHAZW8Y32XnKhnrTgSrFmjmrvlq3WyTcNtYott6L+7iy NM93Fkk9ge9Re1I/eLi30DkEoHknl7IsbrPwDhRFGfI2OVQtRyQQR02pVNyMCKa7MKyC axm90gw3vqrq+h1TOJNz2l9gBhBaaYNOScUWxcIaFkRrfJTj2B6g+b4spOIhWKjhVQkn 5BD5jSPc7mgtjLs5atX189D0T+oB/a0zHF98go3AS80Sh0ZpKwamRfCYsuLaECNSA/SX E+VmAZSv7Hs+iH4FHFXpL/tv14SDPgPgqJp+dazBDswgU+PS400NoXtPdXNIMgc7hHuO O2wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="aapVrq2/"; 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 o12-20020a1709026b0c00b001a1799a0db6si22441451plk.63.2023.03.25.02.06.11; Sat, 25 Mar 2023 02:06:24 -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="aapVrq2/"; 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 S232200AbjCYIgv (ORCPT + 99 others); Sat, 25 Mar 2023 04:36:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232237AbjCYIga (ORCPT ); Sat, 25 Mar 2023 04:36:30 -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 A868B18A84 for ; Sat, 25 Mar 2023 01:36:25 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-93075ee221bso14103566b.0 for ; Sat, 25 Mar 2023 01:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733385; 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=pego/p9EbPQyvAXkY7L5ybuHyA9HZAjsDB9bAcQ4kms=; b=aapVrq2/VavaaG/pVw2Cdc5FlASE0YKac34GycF9wfB/uU2GuL2lyUe8sm3fUpY2tH 1MOnseF8UrPyFaLBUfq13uob6mSvXrvw/hgmk4IkD3ETPvskFZaJZsD3WncmYjFVtaU4 HFzbviED50eIuTTtFZYyWeW7/M9PrDR15oBomiu0GRNkWtupcLkbxgiHUjaNK3VahVDH w/fJypydGVoY3n6ZUubkMZ6zXSQxwppabGgUdPmVwmrdmSgdq5MyzBTNjDRHs3gx9LHp cqfiiMqWirzJD1Fnjh7T6dDwt+Pj3GaV9Yag67OysTQ1hI4r4avb7jxMQDAcudbBruAY hViw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733385; 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=pego/p9EbPQyvAXkY7L5ybuHyA9HZAjsDB9bAcQ4kms=; b=3c1ah8qQadttZP5O1QrLo50glk/qkumN0qDbbZTSE+fp28cHCXtLwtVRsT1HKvna1x NHOtf/0jusBv3hA1aN4/SU0DPAxvkvwxltC/P9rkijd33wwFrozDxtAYEFK8ojMVojEh TFeaxU7DZtDCOtutIjQg+SFEUZpqmrGAvoyj2QwHBySVC6/uF2VnS3p/pU+e/+VM03cX KIBrCC9Sae6E5ouxY3bw1aLTiaFR78VRVDu85tkw/gqSKakCBuYelM6KHhW2CWdFuwmW B6CuATTeMDf/wApVOSg7dd1V3V3hdsigu/itDParWUFXoBtuIMKZytEYWQAJoQQ0jz+r IZuQ== X-Gm-Message-State: AAQBX9cfDEeRW9fH3WPAXKbTcxJMyQv+wIyPdXT5lQq8lm8cRrIIceUE var1scbqhZsmTiGD0N1/2oTaqGhKqTY= X-Received: by 2002:a17:906:748b:b0:8f0:ba09:4abe with SMTP id e11-20020a170906748b00b008f0ba094abemr4117514ejl.2.1679733385189; Sat, 25 Mar 2023 01:36:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id ot17-20020a170906ccd100b008e51a1fd7bfsm11648296ejb.172.2023.03.25.01.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:36:24 -0700 (PDT) Date: Sat, 25 Mar 2023 09:36:23 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_switch_channel_step Message-ID: <1b9e10de4f539aa24150275c80ec4bbd925c853d.1679732276.git.philipp.g.hortmann@gmail.com> 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?1761330001208357367?= X-GMAIL-MSGID: =?utf-8?q?1761330001208357367?= priv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_phy_switch_channel_step as it is dead code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 83 ++++--------------- 1 file changed, 16 insertions(+), 67 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index b528b8ab4b2b..73e426e052b0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -14,24 +14,6 @@ #include "table.h" -static u32 RF_CHANNEL_TABLE_ZEBRA[] = { - 0, - 0x085c, - 0x08dc, - 0x095c, - 0x09dc, - 0x0a5c, - 0x0adc, - 0x0b5c, - 0x0bdc, - 0x0c5c, - 0x0cdc, - 0x0d5c, - 0x0ddc, - 0x0e5c, - 0x0f72, -}; - /*************************Define local function prototype**********************/ static u32 _rtl92e_phy_rf_fw_read(struct net_device *dev, @@ -608,58 +590,25 @@ static u8 _rtl92e_phy_switch_channel_step(struct net_device *dev, u8 channel, 0, 0, 0); RfDependCmdCnt = 0; - switch (priv->rf_chip) { - case RF_8225: - if (!(channel >= 1 && channel <= 14)) { - netdev_err(dev, - "Invalid channel requested for 8225: %d\n", - channel); - return false; - } - _rtl92e_phy_set_sw_chnl_cmd_array(dev, - ieee->RfDependCmd, - RfDependCmdCnt++, - MAX_RFDEPENDCMD_CNT, - CmdID_RF_WriteReg, - rZebra1_Channel, - RF_CHANNEL_TABLE_ZEBRA[channel], - 10); - _rtl92e_phy_set_sw_chnl_cmd_array(dev, - ieee->RfDependCmd, - RfDependCmdCnt++, - MAX_RFDEPENDCMD_CNT, - CmdID_End, 0, 0, 0); - break; - - case RF_8256: - if (!(channel >= 1 && channel <= 14)) { - netdev_err(dev, - "Invalid channel requested for 8256: %d\n", - channel); - return false; - } - _rtl92e_phy_set_sw_chnl_cmd_array(dev, - ieee->RfDependCmd, - RfDependCmdCnt++, - MAX_RFDEPENDCMD_CNT, - CmdID_RF_WriteReg, - rZebra1_Channel, - channel, 10); - _rtl92e_phy_set_sw_chnl_cmd_array(dev, - ieee->RfDependCmd, - RfDependCmdCnt++, - MAX_RFDEPENDCMD_CNT, - CmdID_End, 0, 0, 0); - break; - - case RF_8258: - break; - default: - netdev_warn(dev, "Unknown RF Chip ID\n"); + if (!(channel >= 1 && channel <= 14)) { + netdev_err(dev, + "Invalid channel requested for 8256: %d\n", + channel); return false; } - + _rtl92e_phy_set_sw_chnl_cmd_array(dev, + ieee->RfDependCmd, + RfDependCmdCnt++, + MAX_RFDEPENDCMD_CNT, + CmdID_RF_WriteReg, + rZebra1_Channel, + channel, 10); + _rtl92e_phy_set_sw_chnl_cmd_array(dev, + ieee->RfDependCmd, + RfDependCmdCnt++, + MAX_RFDEPENDCMD_CNT, + CmdID_End, 0, 0, 0); do { switch (*stage) { From patchwork Sat Mar 25 08:36:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp289240vqo; Sat, 25 Mar 2023 02:01:58 -0700 (PDT) X-Google-Smtp-Source: AK7set9sdSJeMiVAQBcckcHmDD1JSNYox0r8rffvkLySDcnaEiPhNCbFsRykOFFgCSpqvyuAQa3Q X-Received: by 2002:a05:6a20:bf26:b0:d5:635c:eaa2 with SMTP id gc38-20020a056a20bf2600b000d5635ceaa2mr5175789pzb.14.1679734918532; Sat, 25 Mar 2023 02:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679734918; cv=none; d=google.com; s=arc-20160816; b=kn6EikNg/TGF69aZLgniOuNovve1n/FDj8cQT05hddw7ZnrIkFVmqmggkNvYfly5nf r7EWRVflMD5SonQB6CY1atYUy+XQZiy1fcixFhLxWLB/BcN7ozo4JEWwYj1yjQqPRoH9 qgbKUY/NNDlcfq51ALqDCeGLrhKgjvjDHgGx6tSagXYZEdw7goZhda95109M2ZOS9+z6 fg9Zy+AkzgIDFkjc67khltZK1pSSCW89pX84o30g9aFjY27JCI4g4OhZYUZDBy+Qrdf3 pbPVoLTHqoO5f0i3oU1Z3OEdvoHsWYGsQqlTCunOO0ht2MeoECRHpLlKuZvEgmJasgtc 7T2A== 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=bvJuEJW/3WhkhbvLRnBCygzL8nJBB9Z+yoFexvWQ38s=; b=riHiKzME9R1LZl1x94mZs3zVdkMENBoCmRDscLn5O3q4VPCNoscieK5gkyn7Nlt1sn wMn/CGuKGZtkbGmAAbS97tPDVTChtzex989mhe1YWSfuOY2SDqTUqeaiMwGKwXW0yg2d jb2LG09ohQe6TOXDL3AiQ3RFU1xCDQ8b46MqzIQcgCzUtldnhbLT6b5sFwYvbR91BYp9 4O/gqStLs0g+ZGfBAPXAHbWk0FSWEg5gh0/jJPC1TP2KOLRMr9XiJoc9DEphMMWFOcBL t25A8ouVn9BSvoqIr2icnXjqkWgmjS7LuQod4yjVXJwZsUr/zrPjb3HEZ5lSpRxfYywy 6wZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NUHUh1h9; 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 q13-20020a65684d000000b0050bebbffdc4si23815806pgt.371.2023.03.25.02.01.44; Sat, 25 Mar 2023 02:01:58 -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=NUHUh1h9; 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 S232140AbjCYIhL (ORCPT + 99 others); Sat, 25 Mar 2023 04:37:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232267AbjCYIgn (ORCPT ); Sat, 25 Mar 2023 04:36:43 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD61319129 for ; Sat, 25 Mar 2023 01:36:38 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id x3so16446579edb.10 for ; Sat, 25 Mar 2023 01:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733397; 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=bvJuEJW/3WhkhbvLRnBCygzL8nJBB9Z+yoFexvWQ38s=; b=NUHUh1h9jI9sYJQDQzGOMmUQ8tRNwVGhP62zpq/wjfZjDja1DbUBHLk2e8shuEgvLn p+8lthD6QAxQDMacV9Hjf2Py8faYqHUIHxwABXmW6AaS9ewYW8zEN69hRtPy1Gm39uAq gUIxj8EeFZAa4M8O/wrDGzChQWsJW4pAYRqb5wGUY+fexZB8JgkkGBb1Lgq07QOvb2Fx K1d15Epka6+dFgXJtHL4kiElh14o5/pckyiFZaLoYemeHXWy0Lb8+/3LHbZFd+sn+oSn jdD3Oc27/pSt5Qhwir1ZtltwOnebx2212OUYlXHpHiuFMVaHbUr3fbu/MQwG2UUyMx7n azsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733397; 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=bvJuEJW/3WhkhbvLRnBCygzL8nJBB9Z+yoFexvWQ38s=; b=uk3e2tKftke8DF3axtJhEtfIRwJ/5wsEH3sHuc6sV7T6GSnrxS07c/+nfidhJwzGpK Byb81eqD/fujq0wgS/dbl2PQ/vOQO71WpKAGn+P5d8deffUMvBYS40si5YIUmF1fEuND PArH/Li99oYEljxalI8YViZysDQzOPCa4FsOzw5hzAAexsRyhAGfK3cTyBxZObvEAiYL pIBOpDNu2C4H9ffq2FemUgCzx3F4LTITWwNs212s68nYKTE1hwZO3js9/OGgEjFQq8RV VpIaU9HsTFXGyFERmdPTLXZoNNHC1UBGBQISGS6nauTOcmSET5A2TNy+fgIgGjkfJW8j Wm6g== X-Gm-Message-State: AAQBX9eaAlrEYJFoxvk2AWfUckEqvKGlQLd8UMxO1/W1LkgG0gs09VAC RqOp/HlOS43fnOTjpYIVAjo= X-Received: by 2002:a05:6402:268e:b0:502:ffd:74a0 with SMTP id w14-20020a056402268e00b005020ffd74a0mr6647571edd.2.1679733396979; Sat, 25 Mar 2023 01:36:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id r3-20020a50aac3000000b004fccef39ec9sm11983991edc.70.2023.03.25.01.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:36:36 -0700 (PDT) Date: Sat, 25 Mar 2023 09:36:34 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_bw_mode_work_item 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?1761329721894101153?= X-GMAIL-MSGID: =?utf-8?q?1761329721894101153?= priv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_set_bw_mode_work_item as those are dead code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 73e426e052b0..1f0d3654c6a0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -849,10 +849,6 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); u8 regBwOpMode; - if (priv->rf_chip == RF_PSEUDO_11N) { - priv->set_bw_mode_in_progress = false; - return; - } if (!priv->up) { netdev_err(dev, "%s(): Driver is not initialized\n", __func__); return; @@ -918,25 +914,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) } - switch (priv->rf_chip) { - case RF_8225: - break; - - case RF_8256: - rtl92e_set_bandwidth(dev, priv->current_chnl_bw); - break; - - case RF_8258: - break; - - case RF_PSEUDO_11N: - break; - - default: - netdev_info(dev, "%s(): Unknown RFChipID: %d\n", __func__, - priv->rf_chip); - break; - } + rtl92e_set_bandwidth(dev, priv->current_chnl_bw); atomic_dec(&(priv->rtllib->atm_swbw)); priv->set_bw_mode_in_progress = false; From patchwork Sat Mar 25 08:36:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp297673vqo; Sat, 25 Mar 2023 02:22:34 -0700 (PDT) X-Google-Smtp-Source: AK7set+YUEn8wLagYO+aRfEJEmUuBb/hU1M4tpnp5MKUXqBg+fnV06UM3bVTXFXIjhkWSaWH0KT5 X-Received: by 2002:a05:6a20:8c01:b0:d6:df31:8ac2 with SMTP id j1-20020a056a208c0100b000d6df318ac2mr5528004pzh.42.1679736154376; Sat, 25 Mar 2023 02:22:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679736154; cv=none; d=google.com; s=arc-20160816; b=ylT4yOl5f2c7wiw2+jlf1DpCwt4fDO0WrUTpumnE0Z3St8yQj1y6KJkhuUmWSZik4J wsSjR1RZurPFX+05L/BmFIOLfYTwzzCuN9BDb085uvqQVAmADQMN0y2zmC5ObtKKph0O uyqAKErz9xr3nLnBCvKJMjlxIOsu6OQ5gSTsL3r1FFLBzYCTpoKaurve25UJ0bTJN8Ul Fnme+aTIt2Lq98CmAAQ7cr5rKUozDU8rjD1UjH1Qx059Qv2OeRTU4Y2A4ZcxHZSGpZTZ 5Twc+UkHUkEO7OsuogwTNsoTKTRAY632Azkrxv7OM064NR20WUUKA2XwqHDrysyQOhUt EsuA== 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=lK9U2QkxOq0arIBvwJf/Y9U+J4k5u5Usg6iA4O1ZSC0=; b=EM3MqXQ/2aRE674nOYZKpdcjkkDWDUfGxGu1XcDf2ihN3Wiz/hF5W00jf+uak0jRkA KSgpoCOdKsR9wIyu/ky0q2XVIObKcCocH4qN2AcIANhSmKiL8jxQ3/YX5yIjWHcBIhgv fXHoxMj5Nnn35oLNvXTLcM7zJcXeMxTVeVzsJSsLUAkJr2fJdxswFuivtee/EyeWJ9mM cRhi6BLT189fZ5e2rEGaznyp+h1lx5i/wy8qFlALbNkLpId5nDrdSz0nyy6vns/sa/Ti 2AcWJNAsJKBbfDpdN1P2yXeKO6y4bXyKH684e5VGjImXz3Bo0fTZVyNmNC4xf3YQwsjk 0nDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="G/Y87BKX"; 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 k2-20020aa788c2000000b00627f0afab65si17665845pff.150.2023.03.25.02.22.22; Sat, 25 Mar 2023 02:22:34 -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="G/Y87BKX"; 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 S232300AbjCYIh0 (ORCPT + 99 others); Sat, 25 Mar 2023 04:37:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232211AbjCYIg4 (ORCPT ); Sat, 25 Mar 2023 04:36:56 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 268871816D for ; Sat, 25 Mar 2023 01:36:46 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id x3so16447337edb.10 for ; Sat, 25 Mar 2023 01:36:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733405; x=1682325405; 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=lK9U2QkxOq0arIBvwJf/Y9U+J4k5u5Usg6iA4O1ZSC0=; b=G/Y87BKXeInyi0J58Okc4ggwBPOYlsX6hM8e43vTAhoJVoxerBpyss6UfYV9oYSyqK huDJwuyRRxGXS+XQG0N15UIYtC+4nPXdFcgbJfRK+60LO0lzngBk4cMpn8PhOhoRh5z+ jLKkbAmv13wATgYQ5AUZ07A40MqUTVt4jVI9ThBu6RDk1z00zyMZFJAnrmK7AzzzjZc4 4nnqBqsshG1eVwhSy8uPVWyNSCsaIbASiaRpb53VrKOMIThCp+qBsX36N33+UCqHFxgE FMy49BqKL33KkBhtJdZdYeTFpHwCtW0LiHcKm5zTgYDqP8dlmndq3oJtmrp9Wb91rWMg wnCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733405; x=1682325405; 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=lK9U2QkxOq0arIBvwJf/Y9U+J4k5u5Usg6iA4O1ZSC0=; b=xf2yu6d82uTMDvm7dpocfiPI+yR9d+tEYigfOgDNTJQ9FaoH5aeRgqdD00iqO4Mo1G 2bJV9phkDPC1tOf+rFP9DkBwEjG3gFxHzR3OsKlD/54Xtw9N9qHTZjE/nybr4ZZJ4Ped YW8Ih18Y/qgpzIIK6Z3H1nSMW3p8PNiio1j4OQB7RMOd3RKCDZUQM3jEh9a+X6Q7/V5q CL09v3uyBFEo/eia27y9Kma3cUFh2oUYFQPHMf4ciWVZJahsm3pgMLwu6GJpwwcntEsB B60VJmq9Irh8w+q7vCWd02cHhE5jiTD8hTAhgD8CsPetdlb9B0OnSnaVzfw0ev3jGFZ+ /OAQ== X-Gm-Message-State: AAQBX9cI96/tPrFciNUAZTBGjIJYcszCoqAc0mQ48ptHGcmDIyydU3cA R45cK9+54WuGQzzcLXpRCDLcUJVBP90= X-Received: by 2002:a17:906:1001:b0:93f:e5e4:8c13 with SMTP id 1-20020a170906100100b0093fe5e48c13mr216269ejm.5.1679733405688; Sat, 25 Mar 2023 01:36:45 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id h13-20020a170906110d00b009333aa81446sm9790043eja.115.2023.03.25.01.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:36:45 -0700 (PDT) Date: Sat, 25 Mar 2023 09:36:43 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_rf_power_state 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?1761331017897376840?= X-GMAIL-MSGID: =?utf-8?q?1761331017897376840?= priv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_set_rf_power_state as those are dead code. Removed unnecessary blank lines to shorten code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 186 +++++++----------- 1 file changed, 76 insertions(+), 110 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 1f0d3654c6a0..b1c297d2ae36 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1040,129 +1040,95 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, return false; priv->set_rf_pwr_state_in_progress = true; - switch (priv->rf_chip) { - case RF_8256: - switch (rf_power_state) { - case rf_on: - if ((priv->rtllib->rf_power_state == rf_off) && - RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { - bool rtstatus; - u32 InitilizeCount = 3; - - do { - InitilizeCount--; - rtstatus = rtl92e_enable_nic(dev); - } while (!rtstatus && (InitilizeCount > 0)); - - if (!rtstatus) { - netdev_err(dev, - "%s(): Failed to initialize Adapter.\n", - __func__); - priv->set_rf_pwr_state_in_progress = false; - return false; - } - - RT_CLEAR_PS_LEVEL(psc, - RT_RF_OFF_LEVL_HALT_NIC); - } else { - rtl92e_writeb(dev, ANAPAR, 0x37); - mdelay(1); - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, - 0x4, 0x1); - priv->hw_rf_off_action = 0; - - rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, - BIT4, 0x1); - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, - 0x300, 0x3); - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, - 0x18, 0x3); - rtl92e_set_bb_reg(dev, rOFDM0_TRxPathEnable, - 0x3, 0x3); - rtl92e_set_bb_reg(dev, rOFDM1_TRxPathEnable, - 0x3, 0x3); - rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, - 0x60, 0x3); - + switch (rf_power_state) { + case rf_on: + if ((priv->rtllib->rf_power_state == rf_off) && + RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { + bool rtstatus; + u32 InitilizeCount = 3; + + do { + InitilizeCount--; + rtstatus = rtl92e_enable_nic(dev); + } while (!rtstatus && (InitilizeCount > 0)); + if (!rtstatus) { + netdev_err(dev, + "%s(): Failed to initialize Adapter.\n", + __func__); + priv->set_rf_pwr_state_in_progress = false; + return false; } - + RT_CLEAR_PS_LEVEL(psc, + RT_RF_OFF_LEVL_HALT_NIC); + } else { + rtl92e_writeb(dev, ANAPAR, 0x37); + mdelay(1); + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, + 0x4, 0x1); + priv->hw_rf_off_action = 0; + rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, + BIT4, 0x1); + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, + 0x300, 0x3); + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, + 0x18, 0x3); + rtl92e_set_bb_reg(dev, rOFDM0_TRxPathEnable, + 0x3, 0x3); + rtl92e_set_bb_reg(dev, rOFDM1_TRxPathEnable, + 0x3, 0x3); + rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, + 0x60, 0x3); + } + break; + case rf_sleep: + if (priv->rtllib->rf_power_state == rf_off) break; - - case rf_sleep: - if (priv->rtllib->rf_power_state == rf_off) + for (QueueID = 0, i = 0; QueueID < MAX_TX_QUEUE; ) { + ring = &priv->tx_ring[QueueID]; + if (skb_queue_len(&ring->queue) == 0) { + QueueID++; + continue; + } else { + udelay(10); + i++; + } + if (i >= MAX_DOZE_WAITING_TIMES_9x) break; - - - for (QueueID = 0, i = 0; QueueID < MAX_TX_QUEUE; ) { - ring = &priv->tx_ring[QueueID]; - - if (skb_queue_len(&ring->queue) == 0) { - QueueID++; - continue; - } else { - udelay(10); - i++; - } - - if (i >= MAX_DOZE_WAITING_TIMES_9x) - break; + } + rtl92e_set_rf_off(dev); + break; + case rf_off: + for (QueueID = 0, i = 0; QueueID < MAX_TX_QUEUE; ) { + ring = &priv->tx_ring[QueueID]; + if (skb_queue_len(&ring->queue) == 0) { + QueueID++; + continue; + } else { + udelay(10); + i++; } + if (i >= MAX_DOZE_WAITING_TIMES_9x) + break; + } + if (psc->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && + !RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { + rtl92e_disable_nic(dev); + RT_SET_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); + } else if (!(psc->RegRfPsLevel & + RT_RF_OFF_LEVL_HALT_NIC)) { rtl92e_set_rf_off(dev); - break; - - case rf_off: - for (QueueID = 0, i = 0; QueueID < MAX_TX_QUEUE; ) { - ring = &priv->tx_ring[QueueID]; - - if (skb_queue_len(&ring->queue) == 0) { - QueueID++; - continue; - } else { - udelay(10); - i++; - } - - if (i >= MAX_DOZE_WAITING_TIMES_9x) - break; - } - - if (psc->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && - !RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { - rtl92e_disable_nic(dev); - RT_SET_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); - } else if (!(psc->RegRfPsLevel & - RT_RF_OFF_LEVL_HALT_NIC)) { - rtl92e_set_rf_off(dev); - } - - break; - - default: - bResult = false; - netdev_warn(dev, - "%s(): Unknown state requested: 0x%X.\n", - __func__, rf_power_state); - break; } - break; - default: - netdev_warn(dev, "%s(): Unknown RF type\n", __func__); + bResult = false; + netdev_warn(dev, + "%s(): Unknown state requested: 0x%X.\n", + __func__, rf_power_state); break; } if (bResult) { priv->rtllib->rf_power_state = rf_power_state; - - switch (priv->rf_chip) { - case RF_8256: - break; - - default: - netdev_warn(dev, "%s(): Unknown RF type\n", __func__); - break; - } } priv->set_rf_pwr_state_in_progress = false; From patchwork Sat Mar 25 08:36: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: 74865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp297269vqo; Sat, 25 Mar 2023 02:21:21 -0700 (PDT) X-Google-Smtp-Source: AKy350ZnN+/RsjitPzq8QicR3KWhqrZRKDMjb4C8Y+Xa0XlmO8NjvyW7TVozkwNb+oaoVaTO4o8g X-Received: by 2002:aa7:da12:0:b0:4ff:7116:189e with SMTP id r18-20020aa7da12000000b004ff7116189emr7083213eds.31.1679736081045; Sat, 25 Mar 2023 02:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679736081; cv=none; d=google.com; s=arc-20160816; b=wEi13vzg3/WM3AnHDR+cp6uzyedYHZhalEtBp6hekisQG1R6kpks9B1nFOTJO9vJBV Vkb43ih1yw/I2YMLEh3T1kbT01VVPTwtl5uHNFb+qcYzMXo15SjW+gZGokMMUya6H6oR XZ4GqE9X7PjQnOVUfCavRSFr92a6H2Fs1iaGHHhkTmzfylvxJhB5234XXCJBHFYUsrwD R8HcA03AyLkSDFonNeMhlaGn8iM9ulk+00jdqK6HPRb7XuW/tEIU8pDYByTKIuwgc2j8 KoE+E6Qm77O02eY7x9DvR6Zj+S/2R4l1+BxV/uReqiKptpshX/X4NmIgxswNh3kL2if6 YNZw== 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=TxvwzNHlMhQxqbhDKY/vp8koWCnsLAxNykHAaCh4kRg=; b=byfg1fffk7rxfp4PDL+WsI5ycKvcq70cqe8VIlJUj/98ZQ6I1QmOiWovMZvsgIXJS6 HcO00TjcdilnR4pLBhQcJkGUQeQS0hW8r94qFAELzz4Ml6ECtBsrtrboq+jBjeRHN4Xh kpVkVid3qECCpjqhr2avWjwL4531w4acNUQ7KQEFwTofPDRdmOIGd0e2YtnPDM8xrf5V 65Idfd5sJnsC1KZiOrLjcmmiGRNitDgAue+4q6//NnDBjf6JLSZAhw/pBpJR5/+JGoxn ZjDketbTgFOxJR7lwCRZRlF1G1USPpJOWv4+QsgjGgq8vuZ9rEKS6/S4EfhNJnEhFNuq tHqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="X/uzSL9E"; 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 r7-20020a056402034700b004acdca46ec2si24140844edw.440.2023.03.25.02.20.57; Sat, 25 Mar 2023 02:21:21 -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="X/uzSL9E"; 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 S232356AbjCYIho (ORCPT + 99 others); Sat, 25 Mar 2023 04:37:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232317AbjCYIhK (ORCPT ); Sat, 25 Mar 2023 04:37:10 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC83C19133 for ; Sat, 25 Mar 2023 01:36:57 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id er18so5298990edb.9 for ; Sat, 25 Mar 2023 01:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733416; 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=TxvwzNHlMhQxqbhDKY/vp8koWCnsLAxNykHAaCh4kRg=; b=X/uzSL9Eb0S+87/KxZ9kB9/5y1GkDhCeHTfCE9i/WhoE4SiX0y0Z85UbK3XRpZeF8V AH5Nrvm1dJa/yqzWOjEsdVRZaCuuRf4t4/OkNP3VVE+dn0wywLLrBIMhEXMhv8fx3Chl Q/H9owBF18aJlv7SuA+dmhP31nyzj+YiaRRSDZc8QXZPWAJYO+yviUVsOQpGOHzA4f7F rAlcv1dMw6b3MAD/1ILwUXif59PJ2Pw0UaIaZWwbxTTx0g0B3BjJagOxIA4LZbsXwGzj aqluWNZ3HsnrqaeBm2WQ71d32zdD0LZ64R1g6NlHfndddk5VvGh3ObM+G+Z7Fko0jRds cV+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733416; 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=TxvwzNHlMhQxqbhDKY/vp8koWCnsLAxNykHAaCh4kRg=; b=kpzoI5Ve5k5Hx5FbghQcGjl3UZoZltvmgPPYoLpaOsDs/s0j3gIqIt5Bp9fcpjOMuV VWdzwy/wdxRQsLPk6yBwhHISoEhrzil4/CLsWczFzLi/r4VrDYLmLNZAITTr0GnRA68B yG8hngBGnjOO/sXKRN0LNcL5gUdga2w5NMHw7KwBsydQ+22Q2m3xhSkd8nbwxvut8OU4 H8foKgnvhbloMTs5Ci31k6OtkBDLpGkB94vpax6B1DxPlhI2b4qsYmaaydSpdnSzSvmC L2xJlKlZ3qTw7+/YhvPmU8YVZCOYpLkHJnTgLLFEl6hTvS9JR/t1AHU4hufX1bfeBEth Ncfw== X-Gm-Message-State: AAQBX9fiqQ2MVd/U+bGj3gEBSBNBD9pJRbyDZHLSJEuzEw8p/xT/wkTo 6VptodjBJyXtW0ivWDIExHo= X-Received: by 2002:a17:906:74ca:b0:8b1:2614:dea6 with SMTP id z10-20020a17090674ca00b008b12614dea6mr5108823ejl.1.1679733416406; Sat, 25 Mar 2023 01:36:56 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id n15-20020a170906118f00b0092421bf4927sm11642321eja.95.2023.03.25.01.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:36:56 -0700 (PDT) Date: Sat, 25 Mar 2023 09:36:54 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] staging: rtl8192e: Remove rf_chip in _rtl92e_get_supported_wireless_mode 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?1761330940963698537?= X-GMAIL-MSGID: =?utf-8?q?1761330940963698537?= priv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_get_supported_wireless_mode as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 3244aef12c05..8e4e939d7617 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -595,23 +595,9 @@ static void _rtl92e_refresh_support_rate(struct r8192_priv *priv) static u8 _rtl92e_get_supported_wireless_mode(struct net_device *dev) { - struct r8192_priv *priv = rtllib_priv(dev); u8 ret = 0; - switch (priv->rf_chip) { - case RF_8225: - case RF_8256: - case RF_6052: - case RF_PSEUDO_11N: - ret = (WIRELESS_MODE_N_24G | WIRELESS_MODE_G | WIRELESS_MODE_B); - break; - case RF_8258: - ret = (WIRELESS_MODE_A | WIRELESS_MODE_N_5G); - break; - default: - ret = WIRELESS_MODE_B; - break; - } + ret = (WIRELESS_MODE_N_24G | WIRELESS_MODE_G | WIRELESS_MODE_B); return ret; } From patchwork Sat Mar 25 08:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp314370vqo; Sat, 25 Mar 2023 03:09:54 -0700 (PDT) X-Google-Smtp-Source: AKy350Zca8BZAYMgux+r3qYXOiiku8X7FFKsmkmPmbe/Gep5SJ+YetWx8+EtjzUM0zgGtJGoGUlL X-Received: by 2002:a17:903:2804:b0:1a1:d5fd:1e71 with SMTP id kp4-20020a170903280400b001a1d5fd1e71mr5345649plb.20.1679738993995; Sat, 25 Mar 2023 03:09:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679738993; cv=none; d=google.com; s=arc-20160816; b=BkoGexggbcJkzAu1GfdheEt+pw/+aWFWoDGnEeFgo6cK6tpd6v8mRju0bkQnyizsd4 1N3PSQ8HWTk8rv9KuDQJNt6FOJDYMNxbq8/ik8i41/VZAyA52mgqf2LcaIo1HumIRGn7 kml586q4sxnUKYVTtFuvhb4vRLfI++2a377vDlwIu53c+KHpiQTfakgpM6DHZ+JP5Hsm Bezx0kSovnL1gtEqHK5ejpJKLQE3zOFWJydGXKko4l11fEiWGzgePjkEczHqZ3jwihSd uEm2tDgDYdxndFYIXwT3R69gPJ/ZpWoFg6g2Ryz4c56kA+7zaTQo9aNBsvL3i1SmKLOv evQg== 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=xenSdzUtugeb0/CqvxP79YZC3E7VL9ki06QF+SB8Qys=; b=bNvnjiOobHJuCcWK5xxGGQJH+Sv4qjLvfUWo9RMRiZgaMtzLvzzNy0jFhlC+zoweuM XxF5ulIlLX3tb1kurbHLa7JU5zcrhrjyqYfUidifNnDqQDjW6E4u7bT2Xxh1nMBv/4oB eGfT9N7l3hs5QO0C+XRXtGUdDr7lrrDvQCWKe/ToAmwX6J9Q2Ct63zJSJuwbstciAuqP emT26tlGe9r27cuBZUyF8/JEyHHHSlJwAsDeY3eW5s0h0fY+Io8sDQycTg1rURPOq2oK HemfSzCXIk4SVv1ngiM60/vhYFFXftbuaLZecYX00FQybKZYERcUOBO1/WZ8YLx83FKI eI9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ius8gLpx; 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 bg11-20020a1709028e8b00b0019ad44844b3si21898355plb.118.2023.03.25.03.09.41; Sat, 25 Mar 2023 03:09:53 -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=Ius8gLpx; 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 S232289AbjCYIiG (ORCPT + 99 others); Sat, 25 Mar 2023 04:38:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232241AbjCYIhW (ORCPT ); Sat, 25 Mar 2023 04:37:22 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 910A819103 for ; Sat, 25 Mar 2023 01:37:05 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-93075ee221bso14108066b.0 for ; Sat, 25 Mar 2023 01:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733424; 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=xenSdzUtugeb0/CqvxP79YZC3E7VL9ki06QF+SB8Qys=; b=Ius8gLpxU5pD8x0/GazMtCB5q0CKLg0MZ7i75GOUkkNagH+fBhqR+TACAHnRUmsK/F iNVLNgyNtTt+1j7Izciy9FaeFRQ9rIPBXWkBRxrE6Tj+7d0kEfJwCf3thyDY1Jwn3kAq Lg1uy4yU5PGZPUjARM49UkUOPaxWNH6ZI73wln1orZXvbsIoQ7rMQro9LilLy58wzhcZ 0s5/3Eyd0rGRUADt5ijACRAv8pvDJgmfspSJDmB4wc8g/w7CPuVpx2PVJ+1PS7bOa3wW E66OL4vDKGDTr69qnYcFZjXBpgMXQa4lwL05+/SmkCF4UqkfLwObjjWJe7qQUxrotp02 AOFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733424; 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=xenSdzUtugeb0/CqvxP79YZC3E7VL9ki06QF+SB8Qys=; b=KtRYSQEBC6ahceBo+Xtm05iF6hMrbjWt5KSZuanJGR8u2QT0Zha7QVa9JXIJuNGbhw 3U1McyXWMTHBYu/jM99B7759bac9zMMKFTxCQB/6iqO7tInlQhTvbeK63zBdVupqk7Wo UGSqFkx0F1Dth3k3lBXkEvXXelUiehEO5iTrp9EU5d6SSzySNRSJlTg+YyrW1TNI5HNI MoHAow735D9qj+etQDHl4g8hNoOeobeT8NyX1K02ZbjymwKqqjQ+Pgyrt+3z8ozAp4U8 c7x76UNETVkJxiUeO6e5DXo6PvKdsvW9THF/MrQ9JiUOIuTAlK3e3hVJri4E7KdT31oa j7wg== X-Gm-Message-State: AAQBX9dcqoKCimsn/PwWRrKAK0EpDxdlV8bL9asRxp/bGxdJ606AlZ1p ADZgmCAm/MO4Ln1+DJUv52Q= X-Received: by 2002:a17:906:51c9:b0:92f:27c2:13c0 with SMTP id v9-20020a17090651c900b0092f27c213c0mr4213970ejk.6.1679733424236; Sat, 25 Mar 2023 01:37:04 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id f23-20020a1709064dd700b00931536d461fsm11431573ejw.20.2023.03.25.01.37.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:37:03 -0700 (PDT) Date: Sat, 25 Mar 2023 09:37:02 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] staging: rtl8192e: Remove priv->rf_chip in _rtl92e_get_channel_map 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?1761333995173922168?= X-GMAIL-MSGID: =?utf-8?q?1761333995173922168?= priv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_get_channel_map as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 8e4e939d7617..ecc3f0c6c267 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -895,13 +895,6 @@ static short _rtl92e_get_channel_map(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); - if ((priv->rf_chip != RF_8225) && (priv->rf_chip != RF_8256) && - (priv->rf_chip != RF_6052)) { - netdev_err(dev, "%s: unknown rf chip, can't set channel map\n", - __func__); - return -1; - } - if (priv->chnl_plan >= COUNTRY_CODE_MAX) { netdev_info(dev, "rtl819x_init:Error channel plan! Set to default.\n"); From patchwork Sat Mar 25 08:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 74873 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp299823vqo; Sat, 25 Mar 2023 02:29:22 -0700 (PDT) X-Google-Smtp-Source: AKy350YIP7e3Ot8+oAEXSuBpCA3N6W6Djg0I0ywzPCibQMzS5K5U+e4u71K5htgPCappJTlT2E10 X-Received: by 2002:a17:90b:4ac8:b0:23f:91e5:103d with SMTP id mh8-20020a17090b4ac800b0023f91e5103dmr5555943pjb.36.1679736562323; Sat, 25 Mar 2023 02:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679736562; cv=none; d=google.com; s=arc-20160816; b=FJvvuksMZ79sTLk16WDDdvjhsEvyydmUi1A+v68Q/5JquV75/3jrFwgPIhWQ06Cd40 rx/R0df9iPUe9t8qxA+UeGGE2BH8/fAQIDUAzFUgpJtHTQDzUadq6QbCzRuXKD99QHbB sD99s+RP5hgfA3SbQQdINjpX0bVfV7CROXicjZ8STqM8n4XOnBZV5U79l+gD6jgdtZIn A9C1yWB9IettiCQVxTbqN7xdnI5vMiEkYt69IPf/HVNecXEgSnbLDqC0g0JeyT5dfwPX aR8SiJl1BccaHlygEfOzi2HsFUZE+YQmzkakwpejWNsOePjHMZDVEpg+kj5/3gawzGcB Gm2g== 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=ovOf0VQJbLs8pFVaHE8+gPaOdY/j18U17OR+um3GAwM=; b=I0Pk9zwDyPag/wLdAIesdIIm4Jh3sO7R0hZB6QTKjIlxaKzxs8jWvi1QvrXgs42HhA IFOGbLHDIlxwCLg7dd0xcSo6lWu8KAuQKkcY5GCTNOFVzw+J9kTJ7Fn0jU+Y45vih7bv C8vjbOjwnR2m3sKglMoxO4yktXAYtVgiRxZ5xKr8V5lGDL0fD9K5hBJ3AC6yekQWjamu p7Xn0oRRAyQjo84zqWX9E7h8PUihT7B9AvzsnFJ43azp4sOl0uj/HOovR6cv2kvCwjIj VnN+xqje55sQvfK97bBxO2S6VNzzwSDQ8T11Ct9fv424TitWusIAKdabwKneGu2d2Ihf N9qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dtQWgKIF; 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 mg14-20020a17090b370e00b0023fc0a96e42si6118887pjb.181.2023.03.25.02.29.09; Sat, 25 Mar 2023 02:29:22 -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=dtQWgKIF; 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 S231778AbjCYIiQ (ORCPT + 99 others); Sat, 25 Mar 2023 04:38:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232307AbjCYIh1 (ORCPT ); Sat, 25 Mar 2023 04:37:27 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23FB018ABB for ; Sat, 25 Mar 2023 01:37:13 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id er18so5300455edb.9 for ; Sat, 25 Mar 2023 01:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679733432; 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=ovOf0VQJbLs8pFVaHE8+gPaOdY/j18U17OR+um3GAwM=; b=dtQWgKIFC5MVE5WHj/tkEOoErziyY01JN1J46VXEddJz7PS+S2DBEEJSsOJ/CaTaIW sY19/NJH1J6atOsJs00RnHMIbUPAQlV4QpY+Fr3RkbZTyk9bu+Bz1I/NHmSr6stiiAdX sZRfkZIMnBMkYFz+WRi44hPFbO5NybGwdxBfVi1OzgF6QgiC/xbAF5Wg6/saDleU/J1T ZCrMnbBRtrlS3n6sTjbZlRTfHt5s4xanHNvHzo4InganGRiifmbbkthFv12NAC3rH1NF 0476n8el5jTVEroOMAF4sG/bkTSYGk04kmjY/cvCRRRUTTIF3e6hKKANUKwRmFYT/BHL 6p0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679733432; 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=ovOf0VQJbLs8pFVaHE8+gPaOdY/j18U17OR+um3GAwM=; b=0tcqyOUKr8KgyQw2cYxTRLYHNKKzmeTonubc/hrEmiTUxAS9vqHQmEwYplTnAMPfDB FusnT3cXSp33yaQ7dLU+mCiAj45xO1vyDzEazLC4yeEunJQHB6jFhZiFGqIXnVxI0Vai 6hUJP1X2lo5ygd7fYaTKlpvlDSQ/UMsv6kTl5gSVbNUXYtNl6+o4Ule8ARv9PLzN3B4z dKqmsUuWtGxtpknerTyL/RSKdZc95HpdLbtlHc7Tos1cgHhllXMM9xGFliomPk7SpYmQ XX8dadvujo/vfXhsvpcPs3Kemdr9hRRdJmLmMcsmf0XHAXKML3SgDFMs6kInJb1AocFP l4Ug== X-Gm-Message-State: AAQBX9dAS5TJstl2foM+d3890qjYVUokYM8TB/UAwXCIjSG9y014ekOA Umt15BJTalIC/0whflVQBo8= X-Received: by 2002:a05:6402:2811:b0:502:92d:4f51 with SMTP id h17-20020a056402281100b00502092d4f51mr6903412ede.1.1679733432752; Sat, 25 Mar 2023 01:37:12 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id ha25-20020a170906a89900b00934212e973esm8623229ejb.198.2023.03.25.01.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 01:37:12 -0700 (PDT) Date: Sat, 25 Mar 2023 09:37:10 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] staging: rtl8192e: Remove priv->rf_chip Message-ID: <2ce85c1a159ae376d82c19c61e694924f07d1093.1679732276.git.philipp.g.hortmann@gmail.com> 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?1761331445626535980?= X-GMAIL-MSGID: =?utf-8?q?1761331445626535980?= priv->rf_chip is initialized to RF_8256 and not used. Remove initialization, variable and enum as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 1e7be321721b..a67927f0c5e3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -432,8 +432,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) rtl92e_init_adaptive_rate(dev); - priv->rf_chip = RF_8256; - if (priv->reg_chnl_plan == 0xf) priv->chnl_plan = priv->eeprom_chnl_plan; else diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index c8816c44ca51..68ec0aeb2dd9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -129,15 +129,6 @@ enum dcmg_txcmd_op { TXCMD_XXXX_CTRL, }; -enum rt_rf_type_819xu { - RF_TYPE_MIN = 0, - RF_8225, - RF_8256, - RF_8258, - RF_6052 = 4, - RF_PSEUDO_11N = 5, -}; - enum rt_customer_id { RT_CID_DEFAULT = 0, RT_CID_819x_CAMEO = 6, @@ -221,7 +212,6 @@ struct r8192_priv { enum rt_customer_id customer_id; - enum rt_rf_type_819xu rf_chip; enum ht_channel_width current_chnl_bw; struct bb_reg_definition phy_reg_def[4]; struct rate_adaptive rate_adaptive;