Re: [PATCH 4/9] staging: r8188eu: remove HW_VAR_ACM_CTRL from SetHwReg8188EU()

Michael Straube
2022-03-29T16:25:44Z

On 3/29/22 18:02, Greg KH wrote:
> On Mon, Mar 28, 2022 at 01:39:35PM +0200, Michael Straube wrote:
>> SetHwReg8188EU() is called with HW_VAR_ACM_CTRL only in one place.
>> Remove the HW_VAR_RESP_SIFS case from SetHwReg8188EU() and replace its
>> call with the code from that case. This is part of the ongoing effort
>> to get rid of the unwanted hal layer.
>>
>> Signed-off-by: Michael Straube <straube.linux@gmail.com>
>> ---
>> drivers/staging/r8188eu/core/rtw_wlan_util.c | 27 +++++++++++++++++---
>> drivers/staging/r8188eu/hal/usb_halinit.c | 26 -------------------
>> drivers/staging/r8188eu/include/hal_intf.h | 1 -
>> 3 files changed, 24 insertions(+), 30 deletions(-)
>>
>> diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
>> index eda4e5f9a6af..cde3779ff21d 100644
>> --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
>> +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
>> @@ -571,10 +571,31 @@ void WMMOnAssocRsp(struct adapter *padapter)
>> }
>> }
>>
>> - if (padapter->registrypriv.acm_method == 1)
>> - SetHwReg8188EU(padapter, HW_VAR_ACM_CTRL, (u8 *)(&acm_mask));
>> - else
>> + if (padapter->registrypriv.acm_method == 1) {
>> + u8 acmctrl = rtw_read8(padapter, REG_ACMHWCTRL);
>> +
>> + if (acm_mask > 1)
>> + acmctrl = acmctrl | 0x1;
>> +
>> + if (acm_mask & BIT(3))
>> + acmctrl |= ACMHW_VOQEN;
>> + else
>> + acmctrl &= (~ACMHW_VOQEN);
>> +
>> + if (acm_mask & BIT(2))
>> + acmctrl |= ACMHW_VIQEN;
>> + else
>> + acmctrl &= (~ACMHW_VIQEN);
>> +
>> + if (acm_mask & BIT(1))
>> + acmctrl |= ACMHW_BEQEN;
>> + else
>> + acmctrl &= (~ACMHW_BEQEN);
>> +
>> + rtw_write8(padapter, REG_ACMHWCTRL, acmctrl);
>
> Shouldn't be a function that explains what you are doing here? Like you
> did with previous changes in this patch series?
>

Sound like a good idea.
I'll send v2 and address your other comments to this series too.

Thanks,
Michael