staging: rtl8723au: Kill off HW_VAR_ACM_CTRL

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

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index 8ede5d08f2892cf1995665d316373ca2af0cb2bc..2d0cc6b3c52d1113e1826070980226439816f7cf 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -627,7 +627,7 @@ void WMMOnAssocRsp23a(struct rtw_adapter *padapter)
        }
 
        if (padapter->registrypriv.acm_method == 1)
-               rtw_hal_set_hwreg23a(padapter, HW_VAR_ACM_CTRL, (u8 *)(&acm_mask));
+               rtl8723a_set_acm_ctrl(padapter, acm_mask);
        else
                padapter->mlmepriv.acm_mask = acm_mask;
 

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 0e2c4031c14de45fb71ce211a1198a845d34e9f7..8c8e98b55255ef43f13d0f023eaf0f7c069f89c2 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3157,10 +3157,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                rtl8723a_odm_support_ability_clr(padapter, *val32);
                break;
 
-       case HW_VAR_ACM_CTRL:
-               rtl8723a_set_acm_ctrl(padapter, *val);
-               break;
-
        case HW_VAR_AMPDU_MIN_SPACE:
                rtl8723a_set_ampdu_min_space(padapter, *val);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index a768957b8f8b63e943b7b25ea536d01265771061..30398d3028d24089b340412342dc46d52c1f0d68 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -45,7 +45,6 @@ enum HW_VARIABLES {
        HW_VAR_DM_FUNC_SET,
        HW_VAR_DM_FUNC_CLR,
        HW_VAR_CAM_READ,
-       HW_VAR_ACM_CTRL,
        HW_VAR_AMPDU_MIN_SPACE,
        HW_VAR_AMPDU_FACTOR,
        HW_VAR_RXDMA_AGG_PG_TH,