From patchwork Tue Sep 10 19:04:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Straube X-Patchwork-Id: 11140005 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 276F314DB for ; Tue, 10 Sep 2019 19:05:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 050A32168B for ; Tue, 10 Sep 2019 19:05:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="u5tU6pfD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726754AbfIJTEu (ORCPT ); Tue, 10 Sep 2019 15:04:50 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43035 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbfIJTEu (ORCPT ); Tue, 10 Sep 2019 15:04:50 -0400 Received: by mail-wr1-f65.google.com with SMTP id q17so17088541wrx.10; Tue, 10 Sep 2019 12:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UT3cZkUDaUMQO15RjZED92gOIdZMcWWa8JAgUM0JUu8=; b=u5tU6pfDkSo0ZwR3/fc10W40t5OO+TAKHFgJExBhRMjkiIDvFu1p5n+FIBW5SXWZ7Y DuP9s0a3Q4DUxYZkxmWRBk/ywYIbpp71rDfgSx2avGoQE1ivtM2s+pzkti2klQtGnQin Yb2Al1ewWW5NvyY3OakJTX9a4wd60i1PKtC2XFQuWxcxIOswoJT6S7rH+r/h3ueQ4/2g Al9cUbLZV/pTHZph3LBNvWpy5sw3lQ8XaaVBQPcTNBgrHcHJt1+3BqtZ0X2JMaD1AfWq wuExovsAp2GhEmHOH5K+T63x/mLewMikdrIt/Q+gKYluPxU8x8Wz6b1N9vLRnoCp6tzv 7l6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UT3cZkUDaUMQO15RjZED92gOIdZMcWWa8JAgUM0JUu8=; b=hT96GqJTop7fKCjR/NpJIkDJ+gLcpL2rtYG0DgvDUXDtwo+0IElBYoG1MeRBrTTe4j acYa37ydenP1u3KaYe/s5cTgX0XGDf4cU7jsFJvFhyCScTi2xHru7lWyuY/DjmOoQZfn j1o3+4g5EoO8c/XuXemeqz2xwkFI4IqibTkUO77Qmu+ERXMrs+dvIaH55pN//+5dPTcD yIBRO+HPvEhlveHg2r7oy9hrrbykm62lUydAKDvoZN+517OQJFfkQwKlLHsHXZVwgUHt Z+1t4/keqqat9Hr7ry244NLTYQWqjdx7WvHgNWNehfhoJ/6YBp2IOaOAo/c0+ifQbU2S 42aA== X-Gm-Message-State: APjAAAVg/6MfZWQ7xJk/MLwd/wZpHnVm0FPkqTKygMmMH1/EUGSh9sRM 0c1ZbAU3uBNCAjEMmudVIlA= X-Google-Smtp-Source: APXvYqxlviCnO+SbPkCGDeqka+rPMo8komwQkshIeYyhRhVESQhn55xLg4AZb+E1ru13fHmpRyy9Qw== X-Received: by 2002:a5d:4c92:: with SMTP id z18mr13990913wrs.111.1568142287717; Tue, 10 Sep 2019 12:04:47 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96bf:e0ab:2b68:5d76:a12a:e6ba]) by smtp.gmail.com with ESMTPSA id w15sm14222967wru.53.2019.09.10.12.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 12:04:47 -0700 (PDT) From: Michael Straube To: kvalo@codeaurora.org Cc: pkshih@realtek.com, davem@davemloft.net, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/3] rtlwifi: rtl8192ce: replace _rtl92c_evm_db_to_percentage with generic version Date: Tue, 10 Sep 2019 21:04:20 +0200 Message-Id: <20190910190422.63378-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190910190422.63378-1-straube.linux@gmail.com> References: <20190910190422.63378-1-straube.linux@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Function _rtl92c_evm_db_to_percentage is functionally identical to the generic version rtl_evm_db_to_percentage, so remove _rtl92c_evm_db_to_percentage and use the generic version instead. Signed-off-by: Michael Straube --- .../wireless/realtek/rtlwifi/rtl8192ce/trx.c | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c index 123dbf0903a1..fc9a3aae047f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c @@ -33,27 +33,6 @@ static u8 _rtl92c_query_rxpwrpercentage(s8 antpower) return 100 + antpower; } -static u8 _rtl92c_evm_db_to_percentage(s8 value) -{ - s8 ret_val; - - ret_val = value; - - if (ret_val >= 0) - ret_val = 0; - - if (ret_val <= -33) - ret_val = -33; - - ret_val = 0 - ret_val; - ret_val *= 3; - - if (ret_val == 99) - ret_val = 100; - - return ret_val; -} - static long _rtl92ce_signal_scale_mapping(struct ieee80211_hw *hw, long currsig) { @@ -243,7 +222,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw, max_spatial_stream = 1; for (i = 0; i < max_spatial_stream; i++) { - evm = _rtl92c_evm_db_to_percentage(p_drvinfo->rxevm[i]); + evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]); if (packet_match_bssid) { /* Fill value in RFD, Get the first From patchwork Tue Sep 10 19:04:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Straube X-Patchwork-Id: 11140009 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F28C112B for ; Tue, 10 Sep 2019 19:05:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A2EC21479 for ; Tue, 10 Sep 2019 19:05:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FJVHb2NZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727113AbfIJTFD (ORCPT ); Tue, 10 Sep 2019 15:05:03 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54010 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726032AbfIJTEu (ORCPT ); Tue, 10 Sep 2019 15:04:50 -0400 Received: by mail-wm1-f66.google.com with SMTP id q18so739541wmq.3; Tue, 10 Sep 2019 12:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W7KZxJZQlQBh9qnOabi1zRfPdYNbJhcPoRClNUhd8jY=; b=FJVHb2NZueail+Sas4/1tsvyii4MpaEovCO5yMLNJDxV0oy/DSda1+elsLz8VTRXOd +VpT+7IVXI99PWwQ1mBMY+IDhGhWTF6ffQPRb08yq1tejZhZs35Pp7fKgzYB9u2BhMLL q5Y1D6AylWIiupK0UB3jl9FAOSilaYKCfTxMCCkme40uf3J6QYcngfyOZkkePNIkg5vb mnl61ktMsCCSQS0mf91vyXAzN2UNbreJXxYxOHwjbdQWQ0fsdoIZZT8dHnZFoeo/jWV2 4wy5dodQ+AOIZiBdh/Q34Ezi31rZs3dcb+Ox717z9Wke8uffBknEmkl17crM6+BUB9nj nF4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W7KZxJZQlQBh9qnOabi1zRfPdYNbJhcPoRClNUhd8jY=; b=hLICGXfOQ44vGk5+cKqW6o7+19e6vIvxaOG19cVKC6mbqvsn+Da4OG2wfptgzNIoqV y4m3BSPR9U1Vx/HgILrl7dCzyRCDPdoKD19/4zdiDIMXlMS/m6kfm1Uo2B2fdoovWsY6 6CJcWCL+plPcFrSUyVO0LRuPH7y9307IcEKi3SbmVy5q0X0zzeIKXDiYdaQ6iR3LHsKU I9aKbVCm3/FjmijYxxeSPBVNN4rLrJJ3e5G8xCry9cPxyPrbq8IgoFY8arNRXkiO39ew wGfuq8/q9iJOOmlSKegE6G49+g35oUfHU/EMDeu6QhVs5Sg3lz+RX+d6U0j/6qMcBXaY z+cA== X-Gm-Message-State: APjAAAVPLrzCKOpJx/xJIwHzPss3eN9vCG4fiZijorhhXmxnfuOCyVWS Pf7SjCzJCNXX9nf2m3jMlQYXUD5B X-Google-Smtp-Source: APXvYqyeENK4P7Ci6k2N7GMiNOei3vR442TkIvBoab5dWf/sjrnbLuCJvCDTag9VJV9NaH1UbPZdfw== X-Received: by 2002:a7b:c34e:: with SMTP id l14mr781443wmj.105.1568142288517; Tue, 10 Sep 2019 12:04:48 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96bf:e0ab:2b68:5d76:a12a:e6ba]) by smtp.gmail.com with ESMTPSA id w15sm14222967wru.53.2019.09.10.12.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 12:04:48 -0700 (PDT) From: Michael Straube To: kvalo@codeaurora.org Cc: pkshih@realtek.com, davem@davemloft.net, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/3] rtlwifi: rtl8192cu: replace _rtl92c_evm_db_to_percentage with generic version Date: Tue, 10 Sep 2019 21:04:21 +0200 Message-Id: <20190910190422.63378-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190910190422.63378-1-straube.linux@gmail.com> References: <20190910190422.63378-1-straube.linux@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Function _rtl92c_evm_db_to_percentage is functionally identical to the generic version rtl_evm_db_to_percentage, so remove _rtl92c_evm_db_to_percentage and use the generic version instead. Signed-off-by: Michael Straube --- .../wireless/realtek/rtlwifi/rtl8192cu/mac.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c index c8daad1e749f..cec19b32c7e2 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c @@ -577,22 +577,6 @@ static u8 _rtl92c_query_rxpwrpercentage(s8 antpower) return 100 + antpower; } -static u8 _rtl92c_evm_db_to_percentage(s8 value) -{ - s8 ret_val; - - ret_val = value; - if (ret_val >= 0) - ret_val = 0; - if (ret_val <= -33) - ret_val = -33; - ret_val = 0 - ret_val; - ret_val *= 3; - if (ret_val == 99) - ret_val = 100; - return ret_val; -} - static long _rtl92c_signal_scale_mapping(struct ieee80211_hw *hw, long currsig) { @@ -743,7 +727,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, else max_spatial_stream = 1; for (i = 0; i < max_spatial_stream; i++) { - evm = _rtl92c_evm_db_to_percentage(p_drvinfo->rxevm[i]); + evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]); if (packet_match_bssid) { if (i == 0) pstats->signalquality = From patchwork Tue Sep 10 19:04:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Straube X-Patchwork-Id: 11140003 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5828F1709 for ; Tue, 10 Sep 2019 19:04:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35CE82171F for ; Tue, 10 Sep 2019 19:04:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="guKxL0Fn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726931AbfIJTEw (ORCPT ); Tue, 10 Sep 2019 15:04:52 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45640 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726679AbfIJTEv (ORCPT ); Tue, 10 Sep 2019 15:04:51 -0400 Received: by mail-wr1-f68.google.com with SMTP id l16so21725668wrv.12; Tue, 10 Sep 2019 12:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/hilQzsCJxKwP3iLZ8HzlKgy8yH9kb6fEFDV5ZKdCyE=; b=guKxL0FnNLiU5TMDidgTSYgeuDCCp9r9hApW3wtyxtFScjHBwNUsnLsm6tbY6FDwTU t/u6ZlTtchki5wWrmGjqydgbnJVG294aOW8R7AIuqm5Bs5KsHs3wl2T99FmZupA7VDCg o0rxxL1oXw+Ri45p4uOBLTCt5GMjMfYHvHxVLajupEnJmLUrLAiwKh9bnKbrYIfBjYBx 6VvJkzNH7YWgmau1t/18BmxoxrWiWahHXK55ckcMydegZ7iwrbTXAlfVYOm9riF/dQkk 6gNcQydwC6SA9TgoL5a54gFvE7sWcMOBPCjOS0Gj3yCftaKtL2HpUMq/2Ll8s7UeZMQS HgWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/hilQzsCJxKwP3iLZ8HzlKgy8yH9kb6fEFDV5ZKdCyE=; b=Szp45FCjl0RcoC6iO247VrzOnGQ2N4AtQN0/3z/f44VQUyqchz+aOgpngQ1X/qRnt2 n80yAKEnkzqqMhuHsGe/+ZtSme0fqjT+FyLQTDeHyfXfossVw0dt9Yfs2XEH3M9reogG b5SgdKGMxC8/4l+mly7MxSMaYSBmKRtOZr7WiYtQmwr8q01FYglE2kbOUhEUqoN240eB UBDhQxhrcH8gENPsdsBpeZFhB1XJLiZWfOja5EhmCIFIlVkDthNT7Q0Jhh8xkU8cvjTI Qlw4NH14vTFB/B66xb0TMAg+6bcjds/4r93CAm2FVYPuSDm8l908/VGPG71IU17aCcEY aKNQ== X-Gm-Message-State: APjAAAWsl0ej9dmxc5LAxF3wJKELpFyZ3OY+Mcv5qCI36Cn+OcMlkbTW s0T4YzBqiMP29wCnekJmuJk= X-Google-Smtp-Source: APXvYqziVqQ9ov3KhhvPUgg3puxHFUg4O/RuIwQstmHpmz5lZB8ZM3LWhklSgOXw5sYb+cS3M4JxRA== X-Received: by 2002:adf:f2cd:: with SMTP id d13mr26723957wrp.143.1568142289391; Tue, 10 Sep 2019 12:04:49 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96bf:e0ab:2b68:5d76:a12a:e6ba]) by smtp.gmail.com with ESMTPSA id w15sm14222967wru.53.2019.09.10.12.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 12:04:48 -0700 (PDT) From: Michael Straube To: kvalo@codeaurora.org Cc: pkshih@realtek.com, davem@davemloft.net, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/3] rtlwifi: rtl8192de: replace _rtl92d_evm_db_to_percentage with generic version Date: Tue, 10 Sep 2019 21:04:22 +0200 Message-Id: <20190910190422.63378-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190910190422.63378-1-straube.linux@gmail.com> References: <20190910190422.63378-1-straube.linux@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Function _rtl92d_evm_db_to_percentage is functionally identical to the generic version rtl_evm_db_to_percentage, so remove _rtl92d_evm_db_to_percentage and use the generic version instead. Signed-off-by: Michael Straube --- .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c index d162884a9e00..2494e1f118f8 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c @@ -4,6 +4,7 @@ #include "../wifi.h" #include "../pci.h" #include "../base.h" +#include "../stats.h" #include "reg.h" #include "def.h" #include "phy.h" @@ -32,21 +33,6 @@ static u8 _rtl92d_query_rxpwrpercentage(s8 antpower) return 100 + antpower; } -static u8 _rtl92d_evm_db_to_percentage(s8 value) -{ - s8 ret_val = value; - - if (ret_val >= 0) - ret_val = 0; - if (ret_val <= -33) - ret_val = -33; - ret_val = 0 - ret_val; - ret_val *= 3; - if (ret_val == 99) - ret_val = 100; - return ret_val; -} - static long _rtl92de_translate_todbm(struct ieee80211_hw *hw, u8 signal_strength_index) { @@ -215,7 +201,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, else max_spatial_stream = 1; for (i = 0; i < max_spatial_stream; i++) { - evm = _rtl92d_evm_db_to_percentage(p_drvinfo->rxevm[i]); + evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]); if (packet_match_bssid) { if (i == 0) pstats->signalquality =