staging: rtl8723bs: remove HAL_{BB,MAC,RF,FW}_ENABLE macros

remove HAL_{BB,MAC,RF,FW}_ENABLE macros.
They are used to turn on/off by hand some core
capabilities we want to be always 'on'.

So remove usages and definitions.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/04248acbd22f9be30d21891926e134490b34036a.1623756906.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 38acde4be94d9a607fa0c1e83b102a604b425d59..3738727feb604f163820176a578ee131399cc1b7 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -683,29 +683,23 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
        /*  <Roger_Notes> Current Channel will be updated again later. */
        pHalData->CurrentChannel = 6;
 
-#if (HAL_MAC_ENABLE == 1)
        ret = PHY_MACConfig8723B(padapter);
        if (ret != _SUCCESS)
                return ret;
-#endif
        /*  */
        /* d. Initialize BB related configurations. */
        /*  */
-#if (HAL_BB_ENABLE == 1)
        ret = PHY_BBConfig8723B(padapter);
        if (ret != _SUCCESS)
                return ret;
-#endif
 
        /*  If RF is on, we need to init RF. Otherwise, skip the procedure. */
        /*  We need to follow SU method to change the RF cfg.txt. Default disable RF TX/RX mode. */
        /* if (pHalData->eRFPowerState == eRfOn) */
        {
-#if (HAL_RF_ENABLE == 1)
                ret = PHY_RFConfig8723B(padapter);
                if (ret != _SUCCESS)
                        return ret;
-#endif
        }
 
        /*  */

diff --git a/drivers/staging/rtl8723bs/include/autoconf.h b/drivers/staging/rtl8723bs/include/autoconf.h
index d1a97fea806560e894dd2c5a92f8ed227a61743c..8587b746c720bfdc85ec448f707d735b286b158b 100644 (file)
--- a/drivers/staging/rtl8723bs/include/autoconf.h
+++ b/drivers/staging/rtl8723bs/include/autoconf.h
@@ -12,7 +12,3 @@
  * Auto Config Section
  */
 #define LPS_RPWM_WAIT_MS 300
-
-#define HAL_MAC_ENABLE 1
-#define HAL_BB_ENABLE  1
-#define HAL_RF_ENABLE  1

diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h
index e9944ffed10031ab57b6dc7c21be7a27d7931b7e..19221289b8ce9908d8da2a8cfeed1ec489f9e989 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_phy.h
+++ b/drivers/staging/rtl8723bs/include/hal_phy.h
@@ -6,14 +6,6 @@
  ******************************************************************************/
 #ifndef __HAL_PHY_H__
 #define __HAL_PHY_H__
-
-
-/*  FPGA_PHY and ASIC */
-#define        HAL_FW_ENABLE   1
-#define        HAL_MAC_ENABLE  1
-#define        HAL_BB_ENABLE   1
-#define        HAL_RF_ENABLE   1
-
 /*  */
 /*  Antenna detection method, i.e., using single tone detection or RSSI reported from each antenna detected. */
 /*  Added by Roger, 2013.05.22. */