| Message ID | 20191211154755.15012-2-straube.linux@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | rtlwifi: convert rtl8192{ce,cu,de} to use generic functions | expand |
Michael Straube <straube.linux@gmail.com> wrote: > 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> 6 patches applied to wireless-drivers-next.git, thanks. f365f2f67b6a rtlwifi: rtl8192ce: use generic rtl_query_rxpwrpercentage b8a19dd64501 rtlwifi: rtl8192cu: use generic rtl_query_rxpwrpercentage 5a87ae1d676e rtlwifi: rtl8192de: use generic rtl_query_rxpwrpercentage d01b26734297 rtlwifi: rtl8192ce: use generic rtl_signal_scale_mapping fef91a2b5f5f rtlwifi: rtl8192cu: use generic rtl_signal_scale_mapping 716c733f52ec rtlwifi: rtl8192de: use generic rtl_signal_scale_mapping
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c index fc9a3aae047f..dec66b3ac365 100644 --- 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;
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> --- .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)