staging: r8188eu: remove HW_VAR_AC_PARAM_BE from SetHwReg8188EU()

Remove the HW_VAR_AC_PARAM_BE case from SetHwReg8188EU() and move the
functionality to the place where SetHwReg8188EU() is called. This is
part of the ongoing effort to get rid of the unwanted hal layer.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220516054830.8702-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index 9585ab41cd3f106d0b764938074229f318fca21b..7caf6a4a4d1755528707e8458d5d948c02288619 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -539,6 +539,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
        struct mlme_ext_info    *pmlmeinfo = &pmlmeext->mlmext_info;
        struct xmit_priv                *pxmitpriv = &padapter->xmitpriv;
        struct registry_priv    *pregpriv = &padapter->registrypriv;
+       struct hal_data_8188e *haldata = &padapter->haldata;
 
        if (pmlmeinfo->WMM_enable == 0) {
                padapter->mlmepriv.acm_mask = 0;
@@ -567,7 +568,8 @@ void WMMOnAssocRsp(struct adapter *padapter)
 
                switch (ACI) {
                case 0x0:
-                       SetHwReg8188EU(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acParm));
+                       haldata->AcParam_BE = acParm;
+                       rtw_write32(padapter, REG_EDCA_BE_PARAM, acParm);
                        acm_mask |= (ACM ? BIT(1) : 0);
                        edca[XMIT_BE_QUEUE] = acParm;
                        break;

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index b62ebd011886c3ddefc84883b28f22d3e72e2032..a217272a07f856b99a80bfddaf99203146bb00b6 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1075,10 +1075,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
        case HW_VAR_DM_FUNC_CLR:
                podmpriv->SupportAbility = 0;
                break;
-       case HW_VAR_AC_PARAM_BE:
-               haldata->AcParam_BE = ((u32 *)(val))[0];
-               rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]);
-               break;
        case HW_VAR_AMPDU_FACTOR:
                {
                        u8 RegToSet_Normal[4] = {0x41, 0xa8, 0x72, 0xb9};

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 26dd395c239fed97f374ede1d0ae4f50daf0ef9e..a56f3d6ca399200e34f42599447557f8c2984825 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -18,7 +18,6 @@ enum hw_variables {
        HW_VAR_DM_FUNC_OP,
        HW_VAR_DM_FUNC_RESET,
        HW_VAR_DM_FUNC_CLR,
-       HW_VAR_AC_PARAM_BE,
        HW_VAR_AMPDU_FACTOR,
        HW_VAR_H2C_MEDIA_STATUS_RPT,
 };