staging: r8188eu: remove HW_VAR_SEC_CFG

Remove HW_VAR_SEC_CFG from SetHwReg8188EU() and call rtw_write8()
directly.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220130190321.7172-3-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 4fff240dfcc4da3692670b034207be7934900060..93462cfcbd4d3c17cc37a95d2cf86aad7b22f098 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -6382,7 +6382,6 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st
 void start_create_ibss(struct adapter *padapter)
 {
        unsigned short  caps;
-       u8 val8;
        u8 join_type;
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -6397,8 +6396,7 @@ void start_create_ibss(struct adapter *padapter)
        caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);
        update_capinfo(padapter, caps);
        if (caps & cap_IBSS) {/* adhoc master */
-               val8 = 0xcf;
-               SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
+               rtw_write8(padapter, REG_SECCFG, 0xcf);
 
                /* switch channel */
                /* SelectChannel(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE); */
@@ -6454,7 +6452,7 @@ void start_clnt_join(struct adapter *padapter)
 
                val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ? 0xcc : 0xcf;
 
-               SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
+               rtw_write8(padapter, REG_SECCFG, val8);
 
                /* switch channel */
                set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
@@ -6470,8 +6468,7 @@ void start_clnt_join(struct adapter *padapter)
        } else if (caps & cap_IBSS) { /* adhoc client */
                Set_MSR(padapter, WIFI_FW_ADHOC_STATE);
 
-               val8 = 0xcf;
-               SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
+               rtw_write8(padapter, REG_SECCFG, 0xcf);
 
                /* switch channel */
                set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 59e0c51e4b1238534302cdcd6aa8a53ddf4ff701..e4d6e413982a800a13bec71d9ba1cb99f4337952 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1290,9 +1290,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        rtw_write8(Adapter, REG_RRSR + 2, regTmp);
                }
                break;
-       case HW_VAR_SEC_CFG:
-               rtw_write8(Adapter, REG_SECCFG, *((u8 *)val));
-               break;
        case HW_VAR_DM_FLAG:
                podmpriv->SupportAbility = *((u8 *)val);
                break;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 1e536ee78251c43b7f8b5a419c80b2e3854683de..b3b38c4957b76f32f4e298a2ec3358ed70063e42 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -23,7 +23,6 @@ enum hw_variables {
        HW_VAR_SLOT_TIME,
        HW_VAR_RESP_SIFS,
        HW_VAR_ACK_PREAMBLE,
-       HW_VAR_SEC_CFG,
        HW_VAR_BCN_VALID,
        HW_VAR_DM_FLAG,
        HW_VAR_DM_FUNC_OP,