staging: r8188eu: remove HW_VAR_AC_PARAM_VI

Remove HW_VAR_AC_PARAM_VI from SetHwReg8188EU() and call
rtw_write32() directly.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220130190321.7172-6-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 a09a4a5d7dc718b242d0efbda5cbb6ffdfd3a1fe..ac1ab5c6b16977d0f92e963436c53d01142acaec 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -562,7 +562,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
                        edca[XMIT_BK_QUEUE] = acParm;
                        break;
                case 0x2:
-                       SetHwReg8188EU(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acParm));
+                       rtw_write32(padapter, REG_EDCA_VI_PARAM, acParm);
                        acm_mask |= (ACM ? BIT(2) : 0);
                        edca[XMIT_VI_QUEUE] = acParm;
                        break;

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 5a9bb6a8a45c2df73e48d88dbd90b28740a3f09d..ef7af9ab368f91a50481b3b20f31af4753445ce0 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1342,9 +1342,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        rtw_write32(Adapter, RWCAM, cmd);
                }
                break;
-       case HW_VAR_AC_PARAM_VI:
-               rtw_write32(Adapter, REG_EDCA_VI_PARAM, ((u32 *)(val))[0]);
-               break;
        case HW_VAR_AC_PARAM_BE:
                haldata->AcParam_BE = ((u32 *)(val))[0];
                rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]);

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 82d67fb68630a137f8fa55835cae4e1b6034f87e..d7e46e57c452f5bd5a9a0f89d7fe451119575bfb 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -31,7 +31,6 @@ enum hw_variables {
        HW_VAR_CAM_EMPTY_ENTRY,
        HW_VAR_CAM_WRITE,
        HW_VAR_CAM_READ,
-       HW_VAR_AC_PARAM_VI,
        HW_VAR_AC_PARAM_BE,
        HW_VAR_AC_PARAM_BK,
        HW_VAR_ACM_CTRL,