staging: rtl8723au: Eliminate HW_WAR_CHK_HI_QUEUE_EMPTY usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-09 23:20:55 +02:00 committed by Greg Kroah-Hartman
parent 0cee8101d8
commit 8d3fd6145b
5 changed files with 14 additions and 11 deletions

View file

@ -1441,11 +1441,11 @@ static void rtw_chk_hi_queue_hdl(struct rtw_adapter *padapter)
return;
if (psta_bmc->sleepq_len == 0) {
u8 val = 0;
bool val;
rtw23a_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val);
val = rtl8723a_chk_hi_queue_empty(padapter);
while(val == false) {
while (val == false) {
msleep(100);
cnt++;
@ -1453,8 +1453,7 @@ static void rtw_chk_hi_queue_hdl(struct rtw_adapter *padapter)
if (cnt>10)
break;
rtw23a_hal_get_hwreg(padapter,
HW_VAR_CHK_HI_QUEUE_EMPTY, &val);
val = rtl8723a_chk_hi_queue_empty(padapter);
}
if (cnt <= 10) {

View file

@ -919,3 +919,12 @@ bool rtl8723a_get_fwlps_rf_on(struct rtw_adapter *padapter)
return retval;
}
bool rtl8723a_chk_hi_queue_empty(struct rtw_adapter *padapter)
{
u32 hgq;
hgq = rtw_read32(padapter, REG_HGQ_INFORMATION);
return ((hgq & 0x0000ff00) == 0) ? true : false;
}

View file

@ -3135,11 +3135,6 @@ void hw_var_set_mlme_join(struct rtw_adapter *padapter, u8 type)
void GetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
{
switch (variable) {
case HW_VAR_CHK_HI_QUEUE_EMPTY:
*val =
((rtw_read32(padapter, REG_HGQ_INFORMATION) & 0x0000ff00) ==
0) ? true : false;
break;
}
}

View file

@ -209,5 +209,6 @@ void rtl8723a_odm_support_ability_clr(struct rtw_adapter *padapter, u32 val);
void rtl8723a_set_rpwm(struct rtw_adapter *padapter, u8 val);
u8 rtl8723a_get_rf_type(struct rtw_adapter *padapter);
bool rtl8723a_get_fwlps_rf_on(struct rtw_adapter *padapter);
bool rtl8723a_chk_hi_queue_empty(struct rtw_adapter *padapter);
#endif /* __HAL_COMMON_H__ */

View file

@ -52,7 +52,6 @@ enum HW_VARIABLES {
/* Unit in microsecond. 0 means disable this function. */
HW_VAR_RPT_TIMER_SETTING,
HW_VAR_TX_RPT_MAX_MACID,
HW_VAR_CHK_HI_QUEUE_EMPTY,
HW_VAR_READ_LLT_TAB,
};