rtlwifi: convert rtl8192{ce,cu,de} to use generic functions
cover rtlwifi: convert rtl8192{ce,cu,de} to use generic functions
This series converts the drivers rtl8192{ce,cu,de} to use the generic functions rtl_query_rxpwrpercentage and rtl_signal_scale_mapping.
Michael Straube (6):
rtlwifi: rtl8192ce: use generic rtl_query_rxpwrpercentage
rtlwifi: rtl8192cu: use generic rtl_query_rxpwrpercentage
rtlwifi: rtl8192de: use generic rtl_query_rxpwrpercentage
rtlwifi: rtl8192ce: use generic rtl_signal_scale_mapping
rtlwifi: rtl8192cu: use generic rtl_signal_scale_mapping
rtlwifi: rtl8192de: use generic rtl_signal_scale_mapping
.../wireless/realtek/rtlwifi/rtl8192ce/trx.c | 48 ++---------------- .../wireless/realtek/rtlwifi/rtl8192cu/mac.c | 49 ++----------------- .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 47 ++---------------- 3 files changed, 14 insertions(+), 130 deletions(-)
Signature · 1 line
2.24.0
PATCH 1/6 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.
--- .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c +2 -12
@@ -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;
Signature · 1 line
2.24.0
Re: [PATCH 1/6] rtlwifi: rtl8192ce: use generic rtl_query_rxpwrpercentage
Quoted 5 lines · Michael Straube
Function
_rtl92c_query_rxpwrpercentageis identical to the generic versionrtl_query_rxpwrpercentage. Remove_rtl92c_query_rxpwrpercentageand use the generic function.Signed-off-by Michael Straube <[email protected]>
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
Signature · 3 lines
https://patchwork.kernel.org/patch/11285545/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/6 rtlwifi: rtl8192cu: use generic rtl_query_rxpwrpercentage
In reply to Michael StraubeFunction _rtl92c_query_rxpwrpercentage is identical to the generic version rtl_query_rxpwrpercentage. Remove _rtl92c_query_rxpwrpercentage and use the generic function.
--- .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c +3 -13
@@ -567,16 +567,6 @@ void rtl92c_set_min_space(struct ieee80211_hw *hw, bool is2T)/*==============================================================*/ -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 _rtl92c_signal_scale_mapping (struct ieee80211_hw *hw,long currsig) {
@@ -678,7 +668,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,break ; } } - pwdb_all =_rtl92c_query_rxpwrpercentage (rx_pwr_all); + pwdb_all =rtl_query_rxpwrpercentage (rx_pwr_all); pstats->rx_pwdb_all = pwdb_all; pstats->recvsignalpower = rx_pwr_all;if (packet_match_bssid) {
@@ -707,7 +697,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, rf_rx_num++; rx_pwr[i] = ((p_drvinfo->gain_trsw[i] &0x3f ) *2 ) -110 ; - rssi =_rtl92c_query_rxpwrpercentage (rx_pwr[i]); + rssi =rtl_query_rxpwrpercentage (rx_pwr[i]); total_rssi += rssi; rtlpriv->stats.rx_snr_db[i] = (long )(p_drvinfo->rxsnr[i] /2 );
@@ -716,7 +706,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, pstats->rx_mimo_signalstrength[i] = (u8 ) rssi; } 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;
Signature · 1 line
2.24.0
PATCH 3/6 rtlwifi: rtl8192de: use generic rtl_query_rxpwrpercentage
In reply to Michael StraubeFunction _rtl92d_query_rxpwrpercentage is identical to the generic version rtl_query_rxpwrpercentage. Remove _rtl92d_query_rxpwrpercentage and use the generic function.
--- .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +3 -13
@@ -23,16 +23,6 @@ static u8 _rtl92de_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)return skb->priority; } -static u8 _rtl92d_query_rxpwrpercentage (s8 antpower) -{ -if ((antpower <=-100 ) || (antpower >=20 )) -return 0 ; -else if (antpower >=0 ) -return 100 ; -else -return 100 + antpower; -} -static long _rtl92de_translate_todbm (struct ieee80211_hw *hw,u8 signal_strength_index) {
@@ -141,7 +131,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,break ; } } - pwdb_all =_rtl92d_query_rxpwrpercentage (rx_pwr_all); + pwdb_all =rtl_query_rxpwrpercentage (rx_pwr_all);/* CCK gain is smaller than OFDM/MCS gain, */ /* so we add gain diff by experiences, the val is 6 */ pwdb_all +=6 ;
@@ -183,7 +173,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, rf_rx_num++; rx_pwr[i] = ((p_drvinfo->gain_trsw[i] &0x3f ) *2 ) -110 ; - rssi =_rtl92d_query_rxpwrpercentage (rx_pwr[i]); + rssi =rtl_query_rxpwrpercentage (rx_pwr[i]); total_rssi += rssi; rtlpriv->stats.rx_snr_db[i] = (long )(p_drvinfo->rxsnr[i] /2 );
@@ -191,7 +181,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, pstats->rx_mimo_signalstrength[i] = (u8 ) rssi; } rx_pwr_all = ((p_drvinfo->pwdb_all >>1 ) &0x7f ) -106 ; - pwdb_all =_rtl92d_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;
Signature · 1 line
2.24.0
PATCH 4/6 rtlwifi: rtl8192ce: use generic rtl_signal_scale_mapping
In reply to Michael StraubeFunction _rtl92ce_signal_scale_mapping is identical to the generic version rtl_signal_scale_mapping. Remove _rtl92ce_signal_scale_mapping and use the generic function.
--- .../wireless/realtek/rtlwifi/rtl8192ce/trx.c | 34 ++----------------- 1 file changed, 2 insertions(+), 32 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c +2 -32
@@ -23,35 +23,6 @@ static u8 _rtl92ce_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)return skb->priority; } -static long _rtl92ce_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 _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw, struct rtl_stats *pstats, struct rx_desc_92c *pdesc,
@@ -231,11 +202,10 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,*/ if (is_cck_rate) pstats->signalstrength = - (u8)(_rtl92ce_signal_scale_mapping (hw, pwdb_all)); + (u8)(rtl_signal_scale_mapping (hw, pwdb_all));else if (rf_rx_num !=0 ) pstats->signalstrength = - (u8)(_rtl92ce_signal_scale_mapping - (hw, total_rssi /= rf_rx_num)); + (u8)(rtl_signal_scale_mapping (hw, total_rssi /= rf_rx_num)); } static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw,
Signature · 1 line
2.24.0
PATCH 5/6 rtlwifi: rtl8192cu: use generic rtl_signal_scale_mapping
In reply to Michael StraubeFunction _rtl92c_signal_scale_mapping is identical to the generic version rtl_signal_scale_mapping. Remove _rtl92c_signal_scale_mapping and use the generic function.
--- .../wireless/realtek/rtlwifi/rtl8192cu/mac.c | 33 ++----------------- 1 file changed, 2 insertions(+), 31 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c +2 -31
@@ -567,34 +567,6 @@ void rtl92c_set_min_space(struct ieee80211_hw *hw, bool is2T)/*==============================================================*/ -static long _rtl92c_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 _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, struct rtl_stats *pstats, struct rx_desc_92c *p_desc,
@@ -729,11 +701,10 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, }if (is_cck_rate) pstats->signalstrength = - (u8) (_rtl92c_signal_scale_mapping (hw, pwdb_all)); + (u8)(rtl_signal_scale_mapping (hw, pwdb_all));else if (rf_rx_num !=0 ) pstats->signalstrength = - (u8) (_rtl92c_signal_scale_mapping - (hw, total_rssi /= rf_rx_num)); + (u8)(rtl_signal_scale_mapping (hw, total_rssi /= rf_rx_num)); } void rtl92c_translate_rx_signal_stuff(struct ieee80211_hw *hw,
Signature · 1 line
2.24.0
PATCH 6/6 rtlwifi: rtl8192de: use generic rtl_signal_scale_mapping
In reply to Michael StraubeFunction _rtl92de_signal_scale_mapping is identical to the generic version rtl_signal_scale_mapping. Remove _rtl92de_signal_scale_mapping and use the generic function.
--- .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 31 ++----------------- 1 file changed, 2 insertions(+), 29 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +2 -29
@@ -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)); }
Signature · 1 line
2.24.0
Quoted 11 lines · Michael Straube
This series converts the drivers rtl8192{ce,cu,de} to use the generic functions
rtl_query_rxpwrpercentageandrtl_signal_scale_mapping.Michael Straube (6):
rtlwifi: rtl8192ce: use genericrtl_query_rxpwrpercentage
rtlwifi: rtl8192cu: use genericrtl_query_rxpwrpercentage
rtlwifi: rtl8192de: use genericrtl_query_rxpwrpercentage
rtlwifi: rtl8192ce: use genericrtl_signal_scale_mapping
rtlwifi: rtl8192cu: use genericrtl_signal_scale_mapping
rtlwifi: rtl8192de: use genericrtl_signal_scale_mapping
Quoted 5 lines
.../wireless/realtek/rtlwifi/rtl8192ce/trx.c | 48 ++---------------- .../wireless/realtek/rtlwifi/rtl8192cu/mac.c | 49 ++----------------- .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 47 ++---------------- 3 files changed, 14 insertions(+), 130 deletions(-)
For all patches:
Curiously. How can you find these function are identical?
Quoted 12 lines · Pkshih
Quoted 11 lines · Michael Straube
This series converts the drivers rtl8192{ce,cu,de} to use the generic functions
rtl_query_rxpwrpercentageandrtl_signal_scale_mapping.Michael Straube (6):
rtlwifi: rtl8192ce: use genericrtl_query_rxpwrpercentage
rtlwifi: rtl8192cu: use genericrtl_query_rxpwrpercentage
rtlwifi: rtl8192de: use genericrtl_query_rxpwrpercentage
rtlwifi: rtl8192ce: use genericrtl_signal_scale_mapping
rtlwifi: rtl8192cu: use genericrtl_signal_scale_mapping
rtlwifi: rtl8192de: use genericrtl_signal_scale_mapping
Quoted 9 lines
Quoted 5 lines
.../wireless/realtek/rtlwifi/rtl8192ce/trx.c | 48 ++---------------- .../wireless/realtek/rtlwifi/rtl8192cu/mac.c | 49 ++----------------- .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 47 ++---------------- 3 files changed, 14 insertions(+), 130 deletions(-)For all patches:
Acked-by Ping-Ke Shih <[email protected]>
Thanks.
Quoted 2 lines
Curiously. How can you find these function are identical?
While sending cleanup patches for some staging wifi drivers I noticed that these functions are used in many of the realtek drivers and all looked very similar. Then used grep and diff to verify.
Michael