staging: r8188eu: remove HW_VAR_AC_PARAM_BE from SetHwReg8188EU()

PATCH New Michael Straube 1 participant 1 message May 16, 2022 Staging

Share & tools

Michael Straube

author

2022-05-16 05:48 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/staging/r8188eu/core/rtw_wlan_util.c | 4 +++-
 drivers/staging/r8188eu/hal/usb_halinit.c    | 4 ----
 drivers/staging/r8188eu/include/hal_intf.h   | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

drivers/staging/r8188eu/core/rtw_wlan_util.c +3 -1

index 27035eac6e61..6c75363c76d4 100644
@@ -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;

drivers/staging/r8188eu/hal/usb_halinit.c +0 -4

index b62ebd011886..a217272a07f8 100644
@@ -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};

drivers/staging/r8188eu/include/hal_intf.h +0 -1

index 26dd395c239f..a56f3d6ca399 100644
@@ -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,
 };

Signature · 1 line

2.36.1