Skip to contentSkip to conversation

rtlwifi: use generic rtl_evm_db_to_percentage

PATCH In review Michael Straube 3 participants 6 messages Sep 10, 2019 – Sep 13, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover rtlwifi: use generic rtl_evm_db_to_percentage

Functions _rtl92{c,d}_evm_db_to_percentage are functionally identical to the generic version rtl_evm_db_to percentage. This series converts rtl8192ce, rtl8192cu and rtl8192de to use the generic version.

Michael Straube (3):
rtlwifi: rtl8192ce: replace _rtl92c_evm_db_to_percentage with generic
version
rtlwifi: rtl8192cu: replace _rtl92c_evm_db_to_percentage with generic
version
rtlwifi: rtl8192de: replace _rtl92d_evm_db_to_percentage with generic
version

 .../wireless/realtek/rtlwifi/rtl8192ce/trx.c  | 23 +------------------
 .../wireless/realtek/rtlwifi/rtl8192cu/mac.c  | 18 +--------------
 .../wireless/realtek/rtlwifi/rtl8192de/trx.c  | 18 ++-------------
 3 files changed, 4 insertions(+), 55 deletions(-)
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/3 rtlwifi: rtl8192ce: replace _rtl92c_evm_db_to_percentage with generic version

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.

---
 .../wireless/realtek/rtlwifi/rtl8192ce/trx.c  | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c +1 -22
index 123dbf0903a1..fc9a3aae047f 100644
@@ -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
Signature · 1 line
2.23.0
#4 lore raw

PATCH 3/3 rtlwifi: rtl8192de: replace _rtl92d_evm_db_to_percentage with generic version

In reply to Michael Straube

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.

---
 .../wireless/realtek/rtlwifi/rtl8192de/trx.c   | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +2 -16
index d162884a9e00..2494e1f118f8 100644
@@ -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 =
Signature · 1 line
2.23.0
#3 lore raw

PATCH 2/3 rtlwifi: rtl8192cu: replace _rtl92c_evm_db_to_percentage with generic version

In reply to Michael Straube

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.

---
 .../wireless/realtek/rtlwifi/rtl8192cu/mac.c   | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c +1 -17
index c8daad1e749f..cec19b32c7e2 100644
@@ -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 =
Signature · 1 line
2.23.0
maintainer Acked-by on the v1 series
#5 lore raw
In reply to Michael Straube
Quoted 12 lines · Michael Straube

Functions _rtl92{c,d}_evm_db_to_percentage are functionally identical to the generic version rtl_evm_db_to percentage. This series converts rtl8192ce, rtl8192cu and rtl8192de to use the generic version.

Michael Straube (3):
  rtlwifi: rtl8192ce: replace _rtl92c_evm_db_to_percentage with generic version
  rtlwifi: rtl8192cu: replace _rtl92c_evm_db_to_percentage with generic version
  rtlwifi: rtl8192de: replace _rtl92d_evm_db_to_percentage with generic version

Quoted 5 lines
 .../wireless/realtek/rtlwifi/rtl8192ce/trx.c  | 23 +------------------
 .../wireless/realtek/rtlwifi/rtl8192cu/mac.c  | 18 +--------------
 .../wireless/realtek/rtlwifi/rtl8192de/trx.c  | 18 ++-------------
 3 files changed, 4 insertions(+), 55 deletions(-)

I checked the generic version and removed functions, and they are indeed identical. Thanks for your patches.

#2 lore raw

Re: [PATCH 1/3] rtlwifi: rtl8192ce: replace _rtl92c_evm_db_to_percentage with generic version

In reply to Michael Straube
Quoted 5 lines · Michael Straube

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.

3 patches applied to wireless-drivers-next.git, thanks.

1335ad27bd07 rtlwifi: rtl8192ce: replace _rtl92c_evm_db_to_percentage with generic version 622c19ed3607 rtlwifi: rtl8192cu: replace _rtl92c_evm_db_to_percentage with generic version 3a1f85798e9f rtlwifi: rtl8192de: replace _rtl92d_evm_db_to_percentage with generic version

Signature · 3 lines
https://patchwork.kernel.org/patch/11140005/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches