staging: r8188eu: remove HW_VAR_BEACON_INTERVAL

Remove HW_VAR_BEACON_INTERVAL from SetHwReg8188EU() and call
rtw_write16() directly.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220130190321.7172-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index d608829830862e15765a75b8a0d6a390849a342a..4fff240dfcc4da3692670b034207be7934900060 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -7035,7 +7035,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
        SetHwReg8188EU(padapter, HW_VAR_BASIC_RATE, cur_network->SupportedRates);
 
        /* BCN interval */
-       SetHwReg8188EU(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&pmlmeinfo->bcn_interval));
+       rtw_write16(padapter, REG_BCN_INTERVAL, pmlmeinfo->bcn_interval);
 
        /* udpate capability */
        update_capinfo(padapter, pmlmeinfo->capability);

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 90f545f177105fb07a52a565dcbd5637d0116059..59e0c51e4b1238534302cdcd6aa8a53ddf4ff701 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1246,9 +1246,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        rtw_write16(Adapter, REG_RL, RetryLimit << RETRY_LIMIT_SHORT_SHIFT | RetryLimit << RETRY_LIMIT_LONG_SHIFT);
                }
                break;
-       case HW_VAR_BEACON_INTERVAL:
-               rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val));
-               break;
        case HW_VAR_SLOT_TIME:
                {
                        u8 u1bAIFS, aSifsTime;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 9e66ef68e1e8901a1b45d5a139dd881a1b0429ff..1e536ee78251c43b7f8b5a419c80b2e3854683de 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -20,7 +20,6 @@ enum hw_variables {
        HW_VAR_MLME_DISCONNECT,
        HW_VAR_MLME_SITESURVEY,
        HW_VAR_MLME_JOIN,
-       HW_VAR_BEACON_INTERVAL,
        HW_VAR_SLOT_TIME,
        HW_VAR_RESP_SIFS,
        HW_VAR_ACK_PREAMBLE,