staging: rtl8723au: Eiminate the use of HW_VAR_AC_PARAM_{VO,VI,BE,BK}

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_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c
index 18ade6036b23e2b448ad27c84e4270cb9b023f7c..59e161c16678f3028ead168a19db3376eeac15d7 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -699,13 +699,13 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
 
        /* Set EDCA param reg */
        acparm = 0x002F3217; /*  VO */
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acparm));
+       rtl8723a_set_ac_param_vo(padapter, acparm);
        acparm = 0x005E4317; /*  VI */
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acparm));
+       rtl8723a_set_ac_param_vi(padapter, acparm);
        acparm = 0x005ea42b;
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acparm));
+       rtl8723a_set_ac_param_be(padapter, acparm);
        acparm = 0x0000A444; /*  BK */
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acparm));
+       rtl8723a_set_ac_param_bk(padapter, acparm);
 
        /* Set Security */
        val8 = (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) ?

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index 221184457b7196b5a7703d4711d57f2a46f59003..8ede5d08f2892cf1995665d316373ca2af0cb2bc 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -602,22 +602,22 @@ void WMMOnAssocRsp23a(struct rtw_adapter *padapter)
 
                switch (ACI) {
                case 0x0:
-                       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acParm));
+                       rtl8723a_set_ac_param_be(padapter, acParm);
                        acm_mask |= (ACM? BIT(1):0);
                        edca[XMIT_BE_QUEUE] = acParm;
                        break;
                case 0x1:
-                       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acParm));
+                       rtl8723a_set_ac_param_bk(padapter, acParm);
                        /* acm_mask |= (ACM? BIT(0):0); */
                        edca[XMIT_BK_QUEUE] = acParm;
                        break;
                case 0x2:
-                       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acParm));
+                       rtl8723a_set_ac_param_vi(padapter, acParm);
                        acm_mask |= (ACM? BIT(2):0);
                        edca[XMIT_VI_QUEUE] = acParm;
                        break;
                case 0x3:
-                       rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acParm));
+                       rtl8723a_set_ac_param_vo(padapter, acParm);
                        acm_mask |= (ACM? BIT(3):0);
                        edca[XMIT_VO_QUEUE] = acParm;
                        break;

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index ba58bab2a3f66b48e2c172a8b813fdff45ac3646..0e2c4031c14de45fb71ce211a1198a845d34e9f7 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3157,22 +3157,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
                rtl8723a_odm_support_ability_clr(padapter, *val32);
                break;
 
-       case HW_VAR_AC_PARAM_VO:
-               rtl8723a_set_ac_param_vo(padapter, *val32);
-               break;
-
-       case HW_VAR_AC_PARAM_VI:
-               rtl8723a_set_ac_param_vi(padapter, *val32);
-               break;
-
-       case HW_VAR_AC_PARAM_BE:
-               rtl8723a_set_ac_param_be(padapter, *val32);
-               break;
-
-       case HW_VAR_AC_PARAM_BK:
-               rtl8723a_set_ac_param_bk(padapter, *val32);
-               break;
-
        case HW_VAR_ACM_CTRL:
                rtl8723a_set_acm_ctrl(padapter, *val);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 64fed853c2faab5598311a84e3fba1b23cd4fda4..a768957b8f8b63e943b7b25ea536d01265771061 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -45,10 +45,6 @@ enum HW_VARIABLES {
        HW_VAR_DM_FUNC_SET,
        HW_VAR_DM_FUNC_CLR,
        HW_VAR_CAM_READ,
-       HW_VAR_AC_PARAM_VO,
-       HW_VAR_AC_PARAM_VI,
-       HW_VAR_AC_PARAM_BE,
-       HW_VAR_AC_PARAM_BK,
        HW_VAR_ACM_CTRL,
        HW_VAR_AMPDU_MIN_SPACE,
        HW_VAR_AMPDU_FACTOR,