From 0599a490f3a95cb5ac6d98de63de95aaf6c70a1c Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 30 Jan 2022 20:03:16 +0100 Subject: [PATCH] staging: r8188eu: remove HW_VAR_MEDIA_STATUS Remove HW_VAR_MEDIA_STATUS from SetHwReg8188EU() and call rtw_read8() and rtw_write8() directly. Signed-off-by: Michael Straube Link: https://lore.kernel.org/r/20220130190321.7172-8-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 6 +++++- drivers/staging/r8188eu/hal/usb_halinit.c | 9 --------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c index 62a96e59b00d7..d28929a95108d 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -286,7 +286,11 @@ void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable) static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type) { - SetHwReg8188EU(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type)); + u8 val8; + + val8 = rtw_read8(padapter, MSR) & 0x0c; + val8 |= type; + rtw_write8(padapter, MSR, val8); } void Set_MSR(struct adapter *padapter, u8 type) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 54087c3b26643..db9a2a963a2a5 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1068,15 +1068,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) struct odm_dm_struct *podmpriv = &haldata->odmpriv; switch (variable) { - case HW_VAR_MEDIA_STATUS: - { - u8 val8; - - val8 = rtw_read8(Adapter, MSR) & 0x0c; - val8 |= *((u8 *)val); - rtw_write8(Adapter, MSR, val8); - } - break; case HW_VAR_SET_OPMODE: hw_var_set_opmode(Adapter, val); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index f41b6d76d73e1..7c04cabc6def4 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -9,7 +9,6 @@ #include "Hal8188EPhyCfg.h" enum hw_variables { - HW_VAR_MEDIA_STATUS, HW_VAR_SET_OPMODE, HW_VAR_BSSID, HW_VAR_INIT_RTS_RATE, -- 2.30.2