rtlwifi: rtl8192ce: use generic rtl_query_rxpwrpercentage

Function _rtl92c_query_rxpwrpercentage is identical to the generic
version rtl_query_rxpwrpercentage. Remove _rtl92c_query_rxpwrpercentage
and use the generic function.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
index fc9a3aae047fc68fa2d4d216b20fcf76c88db91f..dec66b3ac36592384e164722e70ceaf086b27fb3 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
@@ -23,16 +23,6 @@ static u8 _rtl92ce_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
        return skb->priority;
 }
 
-static u8 _rtl92c_query_rxpwrpercentage(s8 antpower)
-{
-       if ((antpower <= -100) || (antpower >= 20))
-               return 0;
-       else if (antpower >= 0)
-               return 100;
-       else
-               return 100 + antpower;
-}
-
 static long _rtl92ce_signal_scale_mapping(struct ieee80211_hw *hw,
                long currsig)
 {
@@ -194,7 +184,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                        rx_pwr[i] =
                            ((p_drvinfo->gain_trsw[i] & 0x3f) * 2) - 110;
                        /* Translate DBM to percentage. */
-                       rssi = _rtl92c_query_rxpwrpercentage(rx_pwr[i]);
+                       rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
                        total_rssi += rssi;
                        /* Get Rx snr value in DB */
                        rtlpriv->stats.rx_snr_db[i] =
@@ -209,7 +199,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                 * hardware (for rate adaptive)
                 */
                rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
-               pwdb_all = _rtl92c_query_rxpwrpercentage(rx_pwr_all);
+               pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
                pstats->rx_pwdb_all = pwdb_all;
                pstats->rxpower = rx_pwr_all;
                pstats->recvsignalpower = rx_pwr_all;