Message ID | 97fef03c12dbc619aab749867fa20686af2b8e3b.1680297150.git.philipp.g.hortmann@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp854421vqo; Fri, 31 Mar 2023 14:36:23 -0700 (PDT) X-Google-Smtp-Source: AKy350ZCRfu9WVDUpC8kDvoG0THohtAmXiA/aPCOIZtjl/d/uFslF658MW4MiE3PjSJTpMQ34Ndx X-Received: by 2002:aa7:cfd8:0:b0:4fd:1cf1:b7b0 with SMTP id r24-20020aa7cfd8000000b004fd1cf1b7b0mr24071264edy.7.1680298583557; Fri, 31 Mar 2023 14:36:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680298583; cv=none; d=google.com; s=arc-20160816; b=BT690o8s+Tk09yFtJYNEZoy+9nshw3DT/NmOYYAus34NHC7h1ghs7j9qUMUMFF/4Yp H7GsNlvt8bzyOcAPzTMUvguR8LLNOi2Hpd76NlVEUgc5kHmzsF0127zsaW6uri+tJVrS 4MBe7j/DpDAZdR/L/jVZJcLX9jQBCIfVLv+TFXmFTGbAfTnhhNTfHV108Jzx23TIpjlK iQ0PVqhtUIZR6UUKY4vOhU+d32APwvJaxsI10BcWAK2NeqbbVVhEX7UEgMMbA8L8YLsW Ov5GfassXImDy3zSUbN/Tmt/RinEVrm2k3LJzGIScmTNplIvDvC4pdoI/kjhtGEgy4N9 6FTg== 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=e9uZA67W0J8w9CI902YQgQUJeWdtlUq1O49C7+5+Pz8=; b=wN0nLq+3eS2zQNpVkK6ZtbHrklzIbV/PT3RKdbgG4R/0Hdg5p80mtoXqunXGTzVRgd uerXflvW7Eru0PVRqy/VxziZzNe1920D+OXcqSiyDJW3mlUKEBfpOIqXQg2WQF/Q8EAj GU2Re1Ej0Qtr3E5+HOEJuM25td91cR63ssFdu7sQ6GBWU4JhO6Dr3Z/zaifrF+18+eDg 0VkqAKYgLCuYe/cGxoHaMmxG0GbyF3ihPw+You3pvDU2kg5Midfz21RwIEovXrxEt4yM iRf2Vi37ARjpLpiz6RrEkSXPMQ35sBrlu96C+JAGYqddEoU6BKukqjrkrCKZV8oZbGwB LWNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=U1nS8FwP; 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 x26-20020aa7cd9a000000b0050270e743d4si441115edv.590.2023.03.31.14.35.58; Fri, 31 Mar 2023 14:36:23 -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=U1nS8FwP; 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 S232470AbjCaV2L (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Fri, 31 Mar 2023 17:28:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231837AbjCaV2I (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 31 Mar 2023 17:28:08 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A34A122EA3 for <linux-kernel@vger.kernel.org>; Fri, 31 Mar 2023 14:28:07 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id cn12so94887848edb.4 for <linux-kernel@vger.kernel.org>; Fri, 31 Mar 2023 14:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680298086; x=1682890086; 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=e9uZA67W0J8w9CI902YQgQUJeWdtlUq1O49C7+5+Pz8=; b=U1nS8FwPD58ih3N7LbDn1tTS+raRgE8DI4T3z1JbCUvgfuCM4RlncHg2TlsQtQHCMI gr0qGfXdxErOiVLueD7Z1YE6Bx45IodE6fual4LiKeQp4DpkQgEr841oLAmpV9tuYC2Y LKfDo5F5mx/+CTj9S4WdpE1EkuF60X9ivDz2XbTvsEY6IrRXLa9ExRvlfaTPbLe8PopN KYsaQ5EGe8N3eJO2pR7VaS6XzOxAS6YNqKCYmtRg9dOP5NW3i28mTJB4gJiqIRD8SH4L fNpqrnUEVU+4f9Pm5yeqLJZaLCnhMh8YofkYZaeD1tQfLRWMM7goBLLTtPrAiT5oGiMP nSzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680298086; x=1682890086; 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=e9uZA67W0J8w9CI902YQgQUJeWdtlUq1O49C7+5+Pz8=; b=Qsqk+IyfxZOaBMiVYXElLdAynkRRIrOYVQ8OhgnpgVWnarV0bSb/qTFkal8VDLPWtz DJNZpokWtYdNBIsu7Ghv3KEmCrxve1Zv08d+DOiFfNL3+g/KPQ7BptgB5ED1653Lw61P SFo8pIYSWiQ8qdpUOGco0jDONp7Vol+vJ0r25FUV3dpg3pwf0GGhDvPE75ohbXlb1d0t 26oAF3XPL9szgasL4UsOCz10emOG0JaoA2EP855girYXoWbh9XINqJpYk3HfHSBqMKxS nQLbcOMT3v0ZZUCYiCYKpDg3uFOCoIn1RGzxExEKBvMkqi1nasnqhthst7tkDtcGBk47 LREQ== X-Gm-Message-State: AAQBX9egBksft0S93E1tiZM1bvazQCRLSZLtp2IPElSk+HNqMdGL+zsb NdN+WHLuBUWIW+OgpfSpbNk= X-Received: by 2002:a17:906:15c:b0:8f5:14ab:94bc with SMTP id 28-20020a170906015c00b008f514ab94bcmr24544306ejh.6.1680298086210; Fri, 31 Mar 2023 14:28:06 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id tq24-20020a170907c51800b00947abb70c93sm1092989ejc.112.2023.03.31.14.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:28:05 -0700 (PDT) Date: Fri, 31 Mar 2023 23:28:03 +0200 From: Philipp Hortmann <philipp.g.hortmann@gmail.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] staging: rtl8192e: Remove enum RF_1T2R Message-ID: <97fef03c12dbc619aab749867fa20686af2b8e3b.1680297150.git.philipp.g.hortmann@gmail.com> References: <cover.1680297150.git.philipp.g.hortmann@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <cover.1680297150.git.philipp.g.hortmann@gmail.com> 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761920767038139624?= X-GMAIL-MSGID: =?utf-8?q?1761920767038139624?= |
Series |
staging: rtl8192e: Remove enum RF_1T2R and useless cases for customer_id
|
|
Commit Message
Philipp Hortmann
March 31, 2023, 9:28 p.m. UTC
enum RF_1T2R is used to initialize a local variable that is then shifted.
The result of the shift is zero. Remove code that has always the same
result to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 3 +--
drivers/staging/rtl8192e/rtllib.h | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
Comments
Hi Philipp,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on staging/staging-testing]
url: https://github.com/intel-lab-lkp/linux/commits/Philipp-Hortmann/staging-rtl8192e-Remove-enum-RF_1T2R/20230401-052904
patch link: https://lore.kernel.org/r/97fef03c12dbc619aab749867fa20686af2b8e3b.1680297150.git.philipp.g.hortmann%40gmail.com
patch subject: [PATCH 1/5] staging: rtl8192e: Remove enum RF_1T2R
config: x86_64-allmodconfig (https://download.01.org/0day-ci/archive/20230402/202304020640.6kQhWbyp-lkp@intel.com/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/151a231e49c070db4fbf7e4a497ad98d30944109
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Philipp-Hortmann/staging-rtl8192e-Remove-enum-RF_1T2R/20230401-052904
git checkout 151a231e49c070db4fbf7e4a497ad98d30944109
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/hid/ drivers/iio/pressure/ drivers/staging/rtl8192e/rtl8192e/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304020640.6kQhWbyp-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/staging/rtl8192e/rtl8192e/rtl_dm.c:613:15: warning: variable 'RF_Type' is uninitialized when used here [-Wuninitialized]
RF_Type);
^~~~~~~
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c:523:12: note: initialize the variable 'RF_Type' to silence this warning
u8 RF_Type, tmp_report[5] = {0, 0, 0, 0, 0};
^
= '\0'
1 warning generated.
vim +/RF_Type +613 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
eae10b8ea5c0811 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-04-13 515
a19b5d7207f7baa drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-09-20 516 static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 517 {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 518 struct r8192_priv *priv = rtllib_priv(dev);
4a67342ea9c7c34 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c YueHaibing 2019-08-21 519 bool viviflag = false;
bdc632bc940f012 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-07-18 520 struct dcmd_txcmd tx_cmd;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 521 u8 powerlevelOFDM24G;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 522 int i = 0, j = 0, k = 0;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 523 u8 RF_Type, tmp_report[5] = {0, 0, 0, 0, 0};
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 524 u32 Value;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 525 u8 Pwr_Flag;
48ca41d38892550 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 526 u16 Avg_TSSI_Meas, tssi_13dBm, Avg_TSSI_Meas_from_driver = 0;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 527 u32 delta = 0;
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 528
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 529 rtl92e_writeb(dev, Pw_Track_Flag, 0);
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 530 rtl92e_writeb(dev, FW_Busy_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 531 priv->rtllib->bdynamic_txpower_enable = false;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 532
48ca41d38892550 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 533 powerlevelOFDM24G = priv->pwr_track >> 24;
151a231e49c070d drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-03-31 534 Value = powerlevelOFDM24G;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 535
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 536 for (j = 0; j <= 30; j++) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 537
9adc341cdcf63a4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Dragan Cvetic 2022-10-10 538 tx_cmd.op = TXCMD_SET_TX_PWR_TRACKING;
9adc341cdcf63a4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Dragan Cvetic 2022-10-10 539 tx_cmd.length = 4;
9adc341cdcf63a4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Dragan Cvetic 2022-10-10 540 tx_cmd.value = Value;
d15fe3e01989df3 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-10-19 541 rtl92e_send_cmd_pkt(dev, DESC_PACKET_TYPE_NORMAL, (u8 *)&tx_cmd,
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 542 sizeof(struct dcmd_txcmd));
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 543 mdelay(1);
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 544 for (i = 0; i <= 30; i++) {
b59a4ca3d442186 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 545 Pwr_Flag = rtl92e_readb(dev, Pw_Track_Flag);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 546
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 547 if (Pwr_Flag == 0) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 548 mdelay(1);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 549
18651492d516607 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-15 550 if (priv->reset_in_progress) {
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 551 rtl92e_writeb(dev, Pw_Track_Flag, 0);
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 552 rtl92e_writeb(dev, FW_Busy_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 553 return;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 554 }
ec07986067a7496 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2022-09-25 555 if (priv->rtllib->rf_power_state != rf_on) {
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 556 rtl92e_writeb(dev, Pw_Track_Flag, 0);
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 557 rtl92e_writeb(dev, FW_Busy_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 558 return;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 559 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 560
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 561 continue;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 562 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 563
1c0a7c0e622a94e drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 564 Avg_TSSI_Meas = rtl92e_readw(dev, Tssi_Mea_Value);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 565
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 566 if (Avg_TSSI_Meas == 0) {
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 567 rtl92e_writeb(dev, Pw_Track_Flag, 0);
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 568 rtl92e_writeb(dev, FW_Busy_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 569 return;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 570 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 571
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 572 for (k = 0; k < 5; k++) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 573 if (k != 4)
b59a4ca3d442186 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 574 tmp_report[k] = rtl92e_readb(dev,
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 575 Tssi_Report_Value1+k);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 576 else
b59a4ca3d442186 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 577 tmp_report[k] = rtl92e_readb(dev,
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 578 Tssi_Report_Value2);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 579
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 580 if (tmp_report[k] <= 20) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 581 viviflag = true;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 582 break;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 583 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 584 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 585
4bb01423ab05af0 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Valentina Manea 2013-10-25 586 if (viviflag) {
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 587 rtl92e_writeb(dev, Pw_Track_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 588 viviflag = false;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 589 for (k = 0; k < 5; k++)
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 590 tmp_report[k] = 0;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 591 break;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 592 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 593
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 594 for (k = 0; k < 5; k++)
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 595 Avg_TSSI_Meas_from_driver += tmp_report[k];
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 596
35e33b0468ab3b3 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-05-31 597 Avg_TSSI_Meas_from_driver *= 100 / 5;
48ca41d38892550 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 598 tssi_13dBm = priv->tssi_13dBm;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 599
48ca41d38892550 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 600 if (Avg_TSSI_Meas_from_driver > tssi_13dBm)
48ca41d38892550 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 601 delta = Avg_TSSI_Meas_from_driver - tssi_13dBm;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 602 else
48ca41d38892550 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 603 delta = tssi_13dBm - Avg_TSSI_Meas_from_driver;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 604
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 605 if (delta <= E_FOR_TX_POWER_TRACK) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 606 priv->rtllib->bdynamic_txpower_enable = true;
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 607 rtl92e_writeb(dev, Pw_Track_Flag, 0);
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 608 rtl92e_writeb(dev, FW_Busy_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 609 return;
285b7c00e06b4fd drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-04-01 610 }
48ca41d38892550 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 611 if (Avg_TSSI_Meas_from_driver < tssi_13dBm - E_FOR_TX_POWER_TRACK)
ea3ab341a205097 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-09-20 612 _rtl92e_dm_tx_update_tssi_weak_signal(dev,
ea3ab341a205097 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-09-20 @613 RF_Type);
eae10b8ea5c0811 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-04-13 614 else
264045986f689af drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-09-20 615 _rtl92e_dm_tx_update_tssi_strong_signal(dev, RF_Type);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 616
6def63e4b4ffe09 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 617 priv->cck_present_attn_diff
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 618 = priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 619
779c9e938d824dc drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-18 620 if (priv->current_chnl_bw == HT_CHANNEL_WIDTH_20)
62310f889a73ea2 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2022-11-13 621 priv->cck_present_attn =
6def63e4b4ffe09 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 622 priv->cck_present_attn_20m_def +
6def63e4b4ffe09 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 623 priv->cck_present_attn_diff;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 624 else
62310f889a73ea2 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2022-11-13 625 priv->cck_present_attn =
6def63e4b4ffe09 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 626 priv->cck_present_attn_40m_def +
6def63e4b4ffe09 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 627 priv->cck_present_attn_diff;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 628
59f6f02ead58fe4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-29 629 if (priv->cck_present_attn > (CCK_TX_BB_GAIN_TABLE_LEN - 1))
59f6f02ead58fe4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-29 630 priv->cck_present_attn = CCK_TX_BB_GAIN_TABLE_LEN - 1;
62310f889a73ea2 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2022-11-13 631 if (priv->cck_present_attn < 0)
62310f889a73ea2 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2022-11-13 632 priv->cck_present_attn = 0;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 633
62310f889a73ea2 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2022-11-13 634 if (priv->cck_present_attn > -1 &&
59f6f02ead58fe4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-29 635 priv->cck_present_attn < CCK_TX_BB_GAIN_TABLE_LEN) {
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 636 if (priv->rtllib->current_network.channel == 14 &&
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 637 !priv->bcck_in_ch14) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 638 priv->bcck_in_ch14 = true;
59e84dc363bfaa6 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 639 rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 640 } else if (priv->rtllib->current_network.channel != 14 && priv->bcck_in_ch14) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 641 priv->bcck_in_ch14 = false;
59e84dc363bfaa6 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 642 rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 643 } else
59e84dc363bfaa6 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 644 rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 645 }
b448b0cc13112c7 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-25 646
6def63e4b4ffe09 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 647 if (priv->cck_present_attn_diff <= -12 ||
6def63e4b4ffe09 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Philipp Hortmann 2023-01-09 648 priv->cck_present_attn_diff >= 24) {
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 649 priv->rtllib->bdynamic_txpower_enable = true;
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 650 rtl92e_writeb(dev, Pw_Track_Flag, 0);
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 651 rtl92e_writeb(dev, FW_Busy_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 652 return;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 653 }
285b7c00e06b4fd drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-04-01 654
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 655 rtl92e_writeb(dev, Pw_Track_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 656 Avg_TSSI_Meas_from_driver = 0;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 657 for (k = 0; k < 5; k++)
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 658 tmp_report[k] = 0;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 659 break;
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 660 }
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 661 rtl92e_writeb(dev, FW_Busy_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 662 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 663 priv->rtllib->bdynamic_txpower_enable = true;
d8ae1967694aca4 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c Mateusz Kulikowski 2015-07-19 664 rtl92e_writeb(dev, Pw_Track_Flag, 0);
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 665 }
94a799425eee822 drivers/staging/rtl8192e/rtl_dm.c Larry Finger 2011-08-23 666
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index b5f4d0230da7..2100d9d4e940 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -531,8 +531,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) priv->rtllib->bdynamic_txpower_enable = false; powerlevelOFDM24G = priv->pwr_track >> 24; - RF_Type = RF_1T2R; - Value = (RF_Type<<8) | powerlevelOFDM24G; + Value = powerlevelOFDM24G; for (j = 0; j <= 30; j++) { diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 197c0a44ebd6..7d83a4c322cf 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -433,10 +433,6 @@ enum led_ctl_mode { LED_CTL_START_TO_LINK = 8, }; -enum rt_rf_type_def { - RF_1T2R = 0, -}; - enum wireless_mode { WIRELESS_MODE_UNKNOWN = 0x00, WIRELESS_MODE_A = 0x01,