staging: rtl8723au: Remove HW_VAR_APFM_ON_MAC

None of this was ever used, so pull it out together with related variables

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/hal_com.c b/drivers/staging/rtl8723au/hal/hal_com.c
index 62281287456f30ce0180e3aeb98e58ee09deb62e..7e657af460b1ea3a4de54df4318fa5814f6eba0c 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_com.c
+++ b/drivers/staging/rtl8723au/hal/hal_com.c
@@ -755,14 +755,6 @@ void rtl8723a_fifo_cleanup(struct rtw_adapter *padapter)
        }
 }
 
-void rtl8723a_set_apfm_on_mac(struct rtw_adapter *padapter, u8 val)
-{
-       struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
-
-       pHalData->bMacPwrCtrlOn = val;
-       DBG_8723A("%s: bMacPwrCtrlOn =%d\n", __func__, pHalData->bMacPwrCtrlOn);
-}
-
 void rtl8723a_bcn_valid(struct rtw_adapter *padapter)
 {
        /* BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2,

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 2c5334512129d77cc6b68e7708b8eb5c47314535..d5ab4d7878617f00d311747ca38a55653d6c0b24 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3144,9 +3144,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
        case HW_VAR_EFUSE_BT_BYTES:
                pHalData->BTEfuseUsedBytes = *((u16 *) val);
                break;
-       case HW_VAR_APFM_ON_MAC:
-               rtl8723a_set_apfm_on_mac(padapter, *val);
-               break;
 
        default:
                break;
@@ -3195,9 +3192,6 @@ void GetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                *((u16 *) val) = pHalData->BTEfuseUsedBytes;
                break;
 
-       case HW_VAR_APFM_ON_MAC:
-               *val = pHalData->bMacPwrCtrlOn;
-               break;
        case HW_VAR_CHK_HI_QUEUE_EMPTY:
                *val =
                    ((rtw_read32(padapter, REG_HGQ_INFORMATION) & 0x0000ff00) ==

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 1fd253733277c14d85d4dd85272e85e8d99b86f7..39ddbcb3d717ab230c1cc6a6f532679c9ffa72fe 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -54,7 +54,6 @@ enum HW_VARIABLES {
        HW_VAR_SWITCH_EPHY_WoWLAN,
        HW_VAR_EFUSE_BYTES,
        HW_VAR_EFUSE_BT_BYTES,
-       HW_VAR_APFM_ON_MAC, /* Auto FSM to Turn On, include clock, isolation, power control for MAC only */
        /*  The valid upper nav range for the HW updating, if the true value is larger than the upper range, the HW won't update it. */
        /*  Unit in microsecond. 0 means disable this function. */
        HW_VAR_RPT_TIMER_SETTING,

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index c20248bab717421a13ecc433f1a1894ab5b663de..5fce43cd55a45702b873570ad660c2c6b09f3e46 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -437,14 +437,6 @@ struct hal_data_8723a {
        /*  Interrupt related register information. */
        u32     IntArray[2];
        u32     IntrMask[2];
-
-       /*  */
-       /*  For SDIO Interface HAL related */
-       /*  */
-
-       /*  Auto FSM to Turn On, include clock, isolation, power control for MAC only */
-       u8                      bMacPwrCtrlOn;
-
 };
 
 #define GET_HAL_DATA(__pAdapter)       ((struct hal_data_8723a *)((__pAdapter)->HalData))