OSDN Git Service

rtlwifi: rtl8192cu: replace _rtl92c_evm_db_to_percentage with generic version
authorMichael Straube <straube.linux@gmail.com>
Tue, 10 Sep 2019 19:04:21 +0000 (21:04 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 13 Sep 2019 15:06:47 +0000 (18:06 +0300)
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 <straube.linux@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c

index c8daad1..cec19b3 100644 (file)
@@ -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 =