From: Michael Straube Date: Sun, 30 Jan 2022 19:03:19 +0000 (+0100) Subject: staging: r8188eu: remove HW_VAR_BCN_FUNC X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6e28b38bad7dd62b8bad888728de5e375ed85b98;p=linux.git staging: r8188eu: remove HW_VAR_BCN_FUNC The HW_VAR_BCN_FUNC case in SetHwReg8188EU() just calls hw_var_set_bcn_func(). Remove HW_VAR_BCN_FUNC from SetHwReg8188EU(), remove hw_var_set_bcn_func() and call rtw_write8() directly. Since hw_var_set_bcn_func() was always called with value 0, we only need to keep the else arm of the if statement that checks the value. Signed-off-by: Michael Straube Link: https://lore.kernel.org/r/20220130190321.7172-11-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index 93462cfcbd4d3..7fabb5b11aac8 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -7626,8 +7626,8 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf) if (((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) { /* Stop BCN */ - val8 = 0; - SetHwReg8188EU(padapter, HW_VAR_BCN_FUNC, (u8 *)(&val8)); + val8 = rtw_read8(padapter, REG_BCN_CTRL); + rtw_write8(padapter, REG_BCN_CTRL, val8 & (~(EN_BCN_FUNCTION | EN_TXBCN_RPT))); } /* set MSR to no link state -> infra. mode */ diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index b92f56a8f35cb..0fda5172ab3d9 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1049,18 +1049,6 @@ static void hw_var_set_bssid(struct adapter *Adapter, u8 *val) rtw_write8(Adapter, (reg_bssid + idx), val[idx]); } -static void hw_var_set_bcn_func(struct adapter *Adapter, u8 *val) -{ - u32 bcn_ctrl_reg; - - bcn_ctrl_reg = REG_BCN_CTRL; - - if (*((u8 *)val)) - rtw_write8(Adapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT)); - else - rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg) & (~(EN_BCN_FUNCTION | EN_TXBCN_RPT))); -} - void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) { struct hal_data_8188e *haldata = &Adapter->haldata; @@ -1109,9 +1097,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) rtw_write8(Adapter, REG_INIRTS_RATE_SEL, RateIndex); } break; - case HW_VAR_BCN_FUNC: - hw_var_set_bcn_func(Adapter, val); - break; case HW_VAR_CORRECT_TSF: { u64 tsf; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 31159265085b4..ee430359abf7f 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -13,7 +13,6 @@ enum hw_variables { HW_VAR_BSSID, HW_VAR_INIT_RTS_RATE, HW_VAR_BASIC_RATE, - HW_VAR_BCN_FUNC, HW_VAR_CORRECT_TSF, HW_VAR_CHECK_BSSID, HW_VAR_MLME_DISCONNECT,