From: Michael Straube <straube.linux@gmail.com>
To: pkshih@realtek.com
Cc: kvalo@codeaurora.org, davem@davemloft.net,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 6/6] rtlwifi: rtl8192de: use generic rtl_signal_scale_mapping
Date: Wed, 11 Dec 2019 16:47:55 +0100 [thread overview]
Message-ID: <20191211154755.15012-7-straube.linux@gmail.com> (raw)
In-Reply-To: <20191211154755.15012-1-straube.linux@gmail.com>
Function _rtl92de_signal_scale_mapping is identical to the generic
version rtl_signal_scale_mapping. Remove _rtl92de_signal_scale_mapping
and use the generic function.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
.../wireless/realtek/rtlwifi/rtl8192de/trx.c | 31 ++-----------------
1 file changed, 2 insertions(+), 29 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
index abb35d33cf69..85194aa30c36 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
@@ -33,33 +33,6 @@ static long _rtl92de_translate_todbm(struct ieee80211_hw *hw,
return signal_power;
}
-static long _rtl92de_signal_scale_mapping(struct ieee80211_hw *hw, long currsig)
-{
- long retsig;
-
- if (currsig >= 61 && currsig <= 100)
- retsig = 90 + ((currsig - 60) / 4);
- else if (currsig >= 41 && currsig <= 60)
- retsig = 78 + ((currsig - 40) / 2);
- else if (currsig >= 31 && currsig <= 40)
- retsig = 66 + (currsig - 30);
- else if (currsig >= 21 && currsig <= 30)
- retsig = 54 + (currsig - 20);
- else if (currsig >= 5 && currsig <= 20)
- retsig = 42 + (((currsig - 5) * 2) / 3);
- else if (currsig == 4)
- retsig = 36;
- else if (currsig == 3)
- retsig = 27;
- else if (currsig == 2)
- retsig = 18;
- else if (currsig == 1)
- retsig = 9;
- else
- retsig = currsig;
- return retsig;
-}
-
static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
struct rtl_stats *pstats,
struct rx_desc_92d *pdesc,
@@ -202,10 +175,10 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
}
}
if (is_cck_rate)
- pstats->signalstrength = (u8)(_rtl92de_signal_scale_mapping(hw,
+ pstats->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
pwdb_all));
else if (rf_rx_num != 0)
- pstats->signalstrength = (u8)(_rtl92de_signal_scale_mapping(hw,
+ pstats->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
total_rssi /= rf_rx_num));
}
--
2.24.0
next prev parent reply other threads:[~2019-12-11 15:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 15:47 [PATCH 0/6] rtlwifi: convert rtl8192{ce,cu,de} to use generic functions Michael Straube
2019-12-11 15:47 ` [PATCH 1/6] rtlwifi: rtl8192ce: use generic rtl_query_rxpwrpercentage Michael Straube
2019-12-18 19:07 ` Kalle Valo
2019-12-11 15:47 ` [PATCH 2/6] rtlwifi: rtl8192cu: " Michael Straube
2019-12-11 15:47 ` [PATCH 3/6] rtlwifi: rtl8192de: " Michael Straube
2019-12-11 15:47 ` [PATCH 4/6] rtlwifi: rtl8192ce: use generic rtl_signal_scale_mapping Michael Straube
2019-12-11 15:47 ` [PATCH 5/6] rtlwifi: rtl8192cu: " Michael Straube
2019-12-11 15:47 ` Michael Straube [this message]
2019-12-12 1:47 ` [PATCH 0/6] rtlwifi: convert rtl8192{ce,cu,de} to use generic functions Pkshih
2019-12-13 11:46 ` Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191211154755.15012-7-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=davem@davemloft.net \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pkshih@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).