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

remove conditional code blocks checked by unused CONFIG_SIGNAL_DISPLAY_DBM

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/abfd2f2fa0425d8e5d8618dd64ef40b4974c71b4.1615801721.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 0ca3ddfc8b08e875c445a1152dd58ff55e94ff55..5d0611c5119b426b4d12bc7f345c925ff2ed93c9 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -4211,7 +4211,7 @@ void site_survey(struct adapter *padapter)
                channel_scan_time_ms = pmlmeext->chan_scan_time;
 
                set_survey_timer(pmlmeext, channel_scan_time_ms);
-#if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
+#ifdef CONFIG_BACKGROUND_NOISE_MONITOR
                {
                        struct noise_info info;
 

diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 29f5cf22f07e9cd2df1a48dde8845e07e8d9f582..c2e820e4c85854f609ee01994f605ecc796c8fcd 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -1262,7 +1262,7 @@ void GetHalODMVar(
 )
 {
        switch (eVariable) {
-#if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
+#ifdef CONFIG_BACKGROUND_NOISE_MONITOR
        case HAL_ODM_NOISE_MONITOR:
                {
                        struct hal_com_data     *pHalData = GET_HAL_DATA(Adapter);
@@ -1313,7 +1313,7 @@ void SetHalODMVar(
        case HAL_ODM_WIFI_DISPLAY_STATE:
                        ODM_CmnInfoUpdate(podmpriv, ODM_CMNINFO_WIFI_DISPLAY, bSet);
                break;
-       #if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
+       #ifdef CONFIG_BACKGROUND_NOISE_MONITOR
        case HAL_ODM_NOISE_MONITOR:
                {
                        struct noise_info *pinfo = pValue1;

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 9ee95fe4266edd94fbf5d6b67b934fb124879454..7bc80851ae49fb2236e7bdb5d3055fe501c0e176 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -313,14 +313,11 @@ static char *translate_scan(struct adapter *padapter,
        /* Add quality statistics */
        iwe.cmd = IWEVQUAL;
        iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED
-       #if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
+       #ifdef CONFIG_BACKGROUND_NOISE_MONITOR
                | IW_QUAL_NOISE_UPDATED
        #else
                | IW_QUAL_NOISE_INVALID
        #endif
-       #ifdef CONFIG_SIGNAL_DISPLAY_DBM
-               | IW_QUAL_DBM
-       #endif
        ;
 
        if (check_fwstate(pmlmepriv, _FW_LINKED) == true &&
@@ -333,9 +330,6 @@ static char *translate_scan(struct adapter *padapter,
        }
 
 
-       #ifdef CONFIG_SIGNAL_DISPLAY_DBM
-       iwe.u.qual.level = (u8)translate_percentage_to_dbm(ss);/* dbm */
-       #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 */
@@ -347,11 +341,10 @@ static char *translate_scan(struct adapter *padapter,
        #else
        iwe.u.qual.level = (u8)ss;/*  */
        #endif
-       #endif
 
        iwe.u.qual.qual = (u8)sq;   /*  signal quality */
 
-       #if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
+       #ifdef CONFIG_BACKGROUND_NOISE_MONITOR
        {
                s16 tmp_noise = 0;
                rtw_hal_get_odm_var(padapter, HAL_ODM_NOISE_MONITOR, &(pnetwork->network.Configuration.DSConfig), &(tmp_noise));
@@ -4732,9 +4725,6 @@ 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_SIGNAL_DISPLAY_DBM
-               tmp_level = translate_percentage_to_dbm(padapter->recvpriv.signal_strength);
-               #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 */
@@ -4746,10 +4736,9 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
                #else
                tmp_level = padapter->recvpriv.signal_strength;
                #endif
-               #endif
 
                tmp_qual = padapter->recvpriv.signal_qual;
-#if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
+#ifdef CONFIG_BACKGROUND_NOISE_MONITOR
                if (rtw_linked_check(padapter)) {
                        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
                        struct noise_info info;
@@ -4776,10 +4765,6 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
        }
        piwstats->qual.updated = IW_QUAL_ALL_UPDATED ;/* IW_QUAL_DBM; */
 
-       #ifdef CONFIG_SIGNAL_DISPLAY_DBM
-       piwstats->qual.updated = piwstats->qual.updated | IW_QUAL_DBM;
-       #endif
-
        return &padapter->iwstats;
 }