Commit 9494dba5 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: r8188eu: remove HW_VAR_CHK_HI_QUEUE_EMPTY from GetHwReg8188EU()

The HW_VAR_CHK_HI_QUEUE_EMPTY from GetHwReg8188EU() just calls
rtw_read32(). Remove HW_VAR_CHK_HI_QUEUE_EMPTY from GetHwReg8188EU()
and call rtw_read32() directly. Move the call to a new function to
indicate what it actually does. This is part of the ongoing effort to
get rid of the unwanted hal layer.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220331130522.6648-4-straube.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae3d0470
...@@ -1199,6 +1199,11 @@ u8 rtw_ps_cmd(struct adapter *padapter) ...@@ -1199,6 +1199,11 @@ u8 rtw_ps_cmd(struct adapter *padapter)
return res; return res;
} }
static bool rtw_is_hi_queue_empty(struct adapter *adapter)
{
return (rtw_read32(adapter, REG_HGQ_INFORMATION) & 0x0000ff00) == 0;
}
static void rtw_chk_hi_queue_hdl(struct adapter *padapter) static void rtw_chk_hi_queue_hdl(struct adapter *padapter)
{ {
int cnt = 0; int cnt = 0;
...@@ -1210,12 +1215,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) ...@@ -1210,12 +1215,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter)
return; return;
if (psta_bmc->sleepq_len == 0) { if (psta_bmc->sleepq_len == 0) {
u8 val = 0; bool val = rtw_is_hi_queue_empty(padapter);
/* while ((rtw_read32(padapter, 0x414)&0x00ffff00)!= 0) */
/* while ((rtw_read32(padapter, 0x414)&0x0000ff00)!= 0) */
GetHwReg8188EU(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val);
while (!val) { while (!val) {
msleep(100); msleep(100);
...@@ -1225,7 +1225,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) ...@@ -1225,7 +1225,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter)
if (cnt > 10) if (cnt > 10)
break; break;
GetHwReg8188EU(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val); val = rtw_is_hi_queue_empty(padapter);
} }
if (cnt <= 10) { if (cnt <= 10) {
......
...@@ -1310,9 +1310,6 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) ...@@ -1310,9 +1310,6 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
} }
} }
break; break;
case HW_VAR_CHK_HI_QUEUE_EMPTY:
*val = ((rtw_read32(Adapter, REG_HGQ_INFORMATION) & 0x0000ff00) == 0) ? true : false;
break;
default: default:
break; break;
} }
......
...@@ -33,7 +33,6 @@ enum hw_variables { ...@@ -33,7 +33,6 @@ enum hw_variables {
HW_VAR_FIFO_CLEARN_UP, HW_VAR_FIFO_CLEARN_UP,
HW_VAR_RPT_TIMER_SETTING, HW_VAR_RPT_TIMER_SETTING,
HW_VAR_H2C_MEDIA_STATUS_RPT, HW_VAR_H2C_MEDIA_STATUS_RPT,
HW_VAR_CHK_HI_QUEUE_EMPTY,
}; };
enum hal_def_variable { enum hal_def_variable {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment