staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_SKIP_SI...

remove conditional code blocks checked by unused
CONFIG_SKIP_SIGNAL_SCALE_MAPPING

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/e21c0b175ba3d8e3310a1f7e94148c10dac7a63c.1615801722.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 13f1d1cbd6b5093661a24cebb9b0f258bc593620..56fd583eb283745e9dbb1be5bd77430ea1f3f7a8 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -226,19 +226,10 @@ static void odm_RxPhyStatus92CSeries_Parsing(
        /* UI BSS List signal strength(in percentage), make it good looking, from 0~100. */
        /* It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp(). */
        if (isCCKrate) {
-#ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING
-               pPhyInfo->SignalStrength = (u8)PWDB_ALL;
-#else
                pPhyInfo->signal_strength = (u8)(odm_SignalScaleMapping(pDM_Odm, PWDB_ALL));/* PWDB_ALL; */
-#endif
        } else {
                if (rf_rx_num != 0) {
-#ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING
-                       total_rssi /= rf_rx_num;
-                       pPhyInfo->signal_strength = (u8)total_rssi;
-#else
                        pPhyInfo->signal_strength = (u8)(odm_SignalScaleMapping(pDM_Odm, total_rssi /= rf_rx_num));
-#endif
                }
        }
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h
index 484e9d62ef928768a9c371df2431fc1c0613bedc..0a56c3a66ee8c50be6af842bd55292c594e95b27 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtw_recv.h
@@ -512,14 +512,9 @@ static inline s32 translate_percentage_to_dbm(u32 SignalStrengthIndex)
 {
        s32     SignalPower; /*  in dBm. */
 
-#ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING
-       /*  Translate to dBm (x =y-100) */
-       SignalPower = SignalStrengthIndex - 100;
-#else
        /*  Translate to dBm (x = 0.5y-95). */
        SignalPower = (s32)((SignalStrengthIndex + 1) >> 1);
        SignalPower -= 95;
-#endif
 
        return SignalPower;
 }

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index c185901f7f139923fbd952283950bd355157b84d..aac1391bdbf1f00fed7d86065ee0466b0939498f 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -325,17 +325,7 @@ static char *translate_scan(struct adapter *padapter,
        }
 
 
-       #ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING
-       {
-               /* Do signal scale mapping when using percentage as the unit of signal strength, since the scale mapping is skipped in odm */
-
-               struct hal_com_data *pHal = GET_HAL_DATA(padapter);
-
-               iwe.u.qual.level = (u8)odm_SignalScaleMapping(&pHal->odmpriv, ss);
-       }
-       #else
        iwe.u.qual.level = (u8)ss;/*  */
-       #endif
 
        iwe.u.qual.qual = (u8)sq;   /*  signal quality */
 
@@ -4695,18 +4685,7 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
                piwstats->qual.noise = 0;
                /* DBG_871X("No link  level:%d, qual:%d, noise:%d\n", tmp_level, tmp_qual, tmp_noise); */
        } else {
-               #ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING
-               {
-                       /* Do signal scale mapping when using percentage as the unit of signal strength, since the scale mapping is skipped in odm */
-
-                       struct hal_com_data *pHal = GET_HAL_DATA(padapter);
-
-                       tmp_level = (u8)odm_SignalScaleMapping(&pHal->odmpriv, padapter->recvpriv.signal_strength);
-               }
-               #else
                tmp_level = padapter->recvpriv.signal_strength;
-               #endif
-
                tmp_qual = padapter->recvpriv.signal_qual;
                tmp_noise = padapter->recvpriv.noise;
                DBG_871X("level:%d, qual:%d, noise:%d, rssi (%d)\n", tmp_level, tmp_qual, tmp_noise, padapter->recvpriv.rssi);