From patchwork Sun Mar 22 13:35:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Priit Laes X-Patchwork-Id: 453118 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F3AEF14008F for ; Mon, 23 Mar 2015 00:36:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803AbbCVNgL (ORCPT ); Sun, 22 Mar 2015 09:36:11 -0400 Received: from plaes.org ([188.166.43.21]:54671 "EHLO plaes.org" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751769AbbCVNgI (ORCPT ); Sun, 22 Mar 2015 09:36:08 -0400 Received: from localhost (112-218-191-90.dyn.estpak.ee [90.191.218.112]) by plaes.org (Postfix) with ESMTPSA id 30232404CA; Sun, 22 Mar 2015 13:36:06 +0000 (UTC) From: Priit Laes To: Kalle Valo Cc: Larry Finger , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Chaoming Li , Joe Perches , Priit Laes Subject: [PATCH v2 3/4] rtlwifi: Rename rtl_translate_todbm to rtl_signalpower_todbm Date: Sun, 22 Mar 2015 15:35:19 +0200 Message-Id: <1427031320-10913-4-git-send-email-plaes@plaes.org> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1427031320-10913-1-git-send-email-plaes@plaes.org> References: <1427031320-10913-1-git-send-email-plaes@plaes.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Priit Laes --- drivers/net/wireless/rtlwifi/stats.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/stats.c b/drivers/net/wireless/rtlwifi/stats.c index 9ebeb6e..4cce472 100644 --- a/drivers/net/wireless/rtlwifi/stats.c +++ b/drivers/net/wireless/rtlwifi/stats.c @@ -48,14 +48,9 @@ u8 rtl_evm_db_to_percentage(char value) } EXPORT_SYMBOL(rtl_evm_db_to_percentage); -static long rtl_translate_todbm(struct ieee80211_hw *hw, - u8 signal_strength_index) +static long rtl_signalpower_todbm(u8 signal_strength_index) { - long signal_power; - - signal_power = (long)((signal_strength_index + 1) >> 1); - signal_power -= 95; - return signal_power; + return (long)((signal_strength_index + 1) >> 1) - 95; } long rtl_signal_scale_mapping(long currsig) @@ -93,7 +88,7 @@ static void rtl_process_ui_rssi(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_phy *rtlphy = &(rtlpriv->phy); u8 rfpath; - u32 last_rssi, tmpval; + u32 last_rssi; if (!pstatus->packet_toself && !pstatus->packet_beacon) return; @@ -112,10 +107,9 @@ static void rtl_process_ui_rssi(struct ieee80211_hw *hw, pstatus->signalstrength; if (rtlpriv->stats.ui_rssi.index >= PHY_RSSI_SLID_WIN_MAX) rtlpriv->stats.ui_rssi.index = 0; - tmpval = rtlpriv->stats.ui_rssi.total_val / - rtlpriv->stats.ui_rssi.total_num; - rtlpriv->stats.signal_strength = rtl_translate_todbm(hw, - (u8) tmpval); + rtlpriv->stats.signal_strength = rtl_signalpower_todbm( + (u8)rtlpriv->stats.ui_rssi.total_val / + rtlpriv->stats.ui_rssi.total_num); pstatus->rssi = rtlpriv->stats.signal_strength; if (pstatus->is_cck)