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 <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220130190321.7172-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index 62a96e59b00d769271597438c1668b7963ab0d58..d28929a95108df2b8aa46877b37c364b9ca871c6 100644 (file)
--- 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 54087c3b266434b2326a9d7dd5d735be88115e4b..db9a2a963a2a5e961d99ab7e6c8d3a1302e5fc3b 100644 (file)
--- 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 f41b6d76d73e16c36be54e9d12558b8acb618e2f..7c04cabc6def4d6eba473e6633303003c69fc492 100644 (file)
--- 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,