staging: rtl8723bs: move function to file hal/odm_HWConfig.c

move function odm_cck_rssi() to hal/odm_HWConfig.c.
As it is used only in this file turn it to
static.

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/c2bb14c3d32d3a654df95288751f0bc8cd6566b0.1628329348.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index 6d7b34fd595e07f84127dee26db28a66d5aaed99..2d4d8d57ceeb9dd9b00c52c7824de081fc0697ae 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -71,6 +71,33 @@ static u8 odm_evm_db_to_percentage(s8 value)
        return ret_val;
 }
 
+static s8 odm_cck_rssi(u8 lna_idx, u8 vga_idx)
+{
+       s8 rx_pwr_all = 0x00;
+
+       switch (lna_idx) {
+       /* 46  53 73 95 201301231630 */
+       /*  46 53 77 99 201301241630 */
+
+       case 6:
+               rx_pwr_all = -34 - (2 * vga_idx);
+               break;
+       case 4:
+               rx_pwr_all = -14 - (2 * vga_idx);
+               break;
+       case 1:
+               rx_pwr_all = 6 - (2 * vga_idx);
+               break;
+       case 0:
+               rx_pwr_all = 16 - (2 * vga_idx);
+               break;
+       default:
+               /* rx_pwr_all = -53+(2*(31-VGA_idx)); */
+               break;
+       }
+       return rx_pwr_all;
+}
+
 static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
                                      struct odm_phy_info *phy_info,
                                      u8 *phy_status,

diff --git a/drivers/staging/rtl8723bs/hal/odm_RTL8723B.c b/drivers/staging/rtl8723bs/hal/odm_RTL8723B.c
index 325f2a7ae337ff05d60dc08cce94c5275525fc9f..66bda505c01ec1d49f9d9c7e16ea717874bda617 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_RTL8723B.c
+++ b/drivers/staging/rtl8723bs/hal/odm_RTL8723B.c
@@ -6,31 +6,3 @@
  ******************************************************************************/
 
 #include "odm_precomp.h"
-
-s8 odm_cck_rssi(u8 lna_idx, u8 vga_idx)
-{
-       s8 rx_pwr_all = 0x00;
-
-       switch (lna_idx) {
-       /* 46  53 73 95 201301231630 */
-       /*  46 53 77 99 201301241630 */
-
-       case 6:
-               rx_pwr_all = -34 - (2 * vga_idx);
-               break;
-       case 4:
-               rx_pwr_all = -14 - (2 * vga_idx);
-               break;
-       case 1:
-               rx_pwr_all = 6 - (2 * vga_idx);
-               break;
-       case 0:
-               rx_pwr_all = 16 - (2 * vga_idx);
-               break;
-       default:
-               /* rx_pwr_all = -53+(2*(31-VGA_idx)); */
-               break;
-
-       }
-       return rx_pwr_all;
-}

diff --git a/drivers/staging/rtl8723bs/hal/odm_RTL8723B.h b/drivers/staging/rtl8723bs/hal/odm_RTL8723B.h
index 752f180ebd46da311eb01ead18c01decd2eb9a90..12b3ca90a43d9b350faf3c6eca5c254daad2f897 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_RTL8723B.h
+++ b/drivers/staging/rtl8723bs/hal/odm_RTL8723B.h
@@ -9,6 +9,4 @@
 
 #define        DM_DIG_MIN_NIC_8723     0x1C
 
-s8 odm_cck_rssi(u8 LNA_idx, u8 VGA_idx);
-
 #endif