Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michael Straube and committed by
Greg Kroah-Hartman
14afedb4 381b6d7b

+3 -6
+3 -1
drivers/staging/r8188eu/core/rtw_wlan_util.c
··· 539 539 struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; 540 540 struct xmit_priv *pxmitpriv = &padapter->xmitpriv; 541 541 struct registry_priv *pregpriv = &padapter->registrypriv; 542 + struct hal_data_8188e *haldata = &padapter->haldata; 542 543 543 544 if (pmlmeinfo->WMM_enable == 0) { 544 545 padapter->mlmepriv.acm_mask = 0; ··· 568 567 569 568 switch (ACI) { 570 569 case 0x0: 571 - SetHwReg8188EU(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acParm)); 570 + haldata->AcParam_BE = acParm; 571 + rtw_write32(padapter, REG_EDCA_BE_PARAM, acParm); 572 572 acm_mask |= (ACM ? BIT(1) : 0); 573 573 edca[XMIT_BE_QUEUE] = acParm; 574 574 break;
-4
drivers/staging/r8188eu/hal/usb_halinit.c
··· 1075 1075 case HW_VAR_DM_FUNC_CLR: 1076 1076 podmpriv->SupportAbility = 0; 1077 1077 break; 1078 - case HW_VAR_AC_PARAM_BE: 1079 - haldata->AcParam_BE = ((u32 *)(val))[0]; 1080 - rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); 1081 - break; 1082 1078 case HW_VAR_AMPDU_FACTOR: 1083 1079 { 1084 1080 u8 RegToSet_Normal[4] = {0x41, 0xa8, 0x72, 0xb9};
-1
drivers/staging/r8188eu/include/hal_intf.h
··· 18 18 HW_VAR_DM_FUNC_OP, 19 19 HW_VAR_DM_FUNC_RESET, 20 20 HW_VAR_DM_FUNC_CLR, 21 - HW_VAR_AC_PARAM_BE, 22 21 HW_VAR_AMPDU_FACTOR, 23 22 HW_VAR_H2C_MEDIA_STATUS_RPT, 24 23 };