staging: rtlwifi: Remove unnecessary function

Because the odm_signal_scale_mapping function is only called to return the second argument, remove the function and change five statements that call it.

Signed-off-by Maya Nakamura <[email protected]>

---
Changes since v1:
- Remove a function's declaration, definition, and its comment.
- Change five statements that call the function.

 .../staging/rtlwifi/phydm/phydm_hwconfig.c    | 27 ++++---------------
 .../staging/rtlwifi/phydm/phydm_hwconfig.h    |  2 --
 2 files changed, 5 insertions(+), 24 deletions(-)

drivers/staging/rtlwifi/phydm/phydm_hwconfig.c +5 -22

index 4bf86e5a451f..fd208581d857 100644
@@ -477,18 +477,6 @@ static u8 odm_query_rx_pwr_percentage(s8 ant_power)
 		return 100 + ant_power;
 }
 
-/*
- * 2012/01/12 MH MOve some signal strength smooth method to MP HAL layer.
- * IF other SW team do not support the feature, remove this section.??
- */
-
-s32 odm_signal_scale_mapping(struct phy_dm_struct *dm, s32 curr_sig)
-{
-	{
-		return curr_sig;
-	}
-}
-
 static u8 odm_sq_process_patch_rt_cid_819x_lenovo(struct phy_dm_struct *dm,
 						  u8 is_cck_rate, u8 pwdb_all,
 						  u8 path, u8 RSSI)

@@ -749,13 +737,11 @@ static void odm_rx_phy_status92c_series_parsing(
 	 */
 	/* It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp(). */
 	if (is_cck_rate) {
-		phy_info->signal_strength = (u8)(
-			odm_signal_scale_mapping(dm, pwdb_all)); /*pwdb_all;*/
+		phy_info->signal_strength = (u8)pwdb_all;
 	} else {
 		if (rf_rx_num != 0) {
 			phy_info->signal_strength =
-				(u8)(odm_signal_scale_mapping(dm, total_rssi /=
-								  rf_rx_num));
+				(u8)(total_rssi /= rf_rx_num);
 		}
 	}
 

@@ -1051,8 +1037,7 @@ static void odm_rx_phy_status_jaguar_series_parsing(
 	 */
 	/*It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp().*/
 	if (is_cck_rate) {
-		phy_info->signal_strength = (u8)(
-			odm_signal_scale_mapping(dm, pwdb_all)); /*pwdb_all;*/
+		phy_info->signal_strength = (u8)pwdb_all;
 	} else {
 		if (rf_rx_num != 0) {
 			/* 2015/01 Sean, use the best two RSSI only,

@@ -1062,8 +1047,7 @@ static void odm_rx_phy_status_jaguar_series_parsing(
 				avg_rssi = best_rssi;
 			else
 				avg_rssi = (best_rssi + second_rssi) / 2;
-			phy_info->signal_strength =
-				(u8)(odm_signal_scale_mapping(dm, avg_rssi));
+			phy_info->signal_strength = (u8)avg_rssi;
 		}
 	}
 	dm->rx_pwdb_ave = dm->rx_pwdb_ave + phy_info->rx_pwdb_all;

@@ -1874,8 +1858,7 @@ void phydm_rx_phy_status_new_type(struct phy_dm_struct *phydm, u8 *phy_status,
 	/* Update signal strength to UI, and phy_info->rx_pwdb_all is the
 	 * maximum RSSI of all path
 	 */
-	phy_info->signal_strength =
-		(u8)(odm_signal_scale_mapping(phydm, phy_info->rx_pwdb_all));
+	phy_info->signal_strength = (u8)phy_info->rx_pwdb_all;
 
 	/* Calculate average RSSI and smoothed RSSI */
 	phydm_process_rssi_for_dm_new_type(phydm, phy_info, pktinfo);

drivers/staging/rtlwifi/phydm/phydm_hwconfig.h +0 -2

index 6ad5e0292a97..c9833889688c 100644
@@ -216,8 +216,6 @@ odm_config_fw_with_header_file(struct phy_dm_struct *dm,
 
 u32 odm_get_hw_img_version(struct phy_dm_struct *dm);
 
-s32 odm_signal_scale_mapping(struct phy_dm_struct *dm, s32 curr_sig);
-
 /*For 8822B only!! need to move to FW finally */
 /*==============================================*/
 void phydm_rx_phy_status_new_type(struct phy_dm_struct *phydm, u8 *phy_status,

Signature · 1 line

2.17.1