staging: rtl8723au: Remove HW_VAR_MEDIA_STATUS* usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index 3ed3beb2e6d31afb3afc48fdd7f332da38ba693e..0114c46c36a1198b59bfa0b84f10f61697be646d 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -304,14 +304,9 @@ void Switch_DM_Func23a(struct rtw_adapter *padapter, unsigned long mode, u8 enab
                rtw_hal_set_hwreg23a(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode));
 }
 
-static void Set_NETYPE0_MSR(struct rtw_adapter *padapter, u8 type)
-{
-       rtw_hal_set_hwreg23a(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type));
-}
-
 void Set_MSR23a(struct rtw_adapter *padapter, u8 type)
 {
-               Set_NETYPE0_MSR(padapter, type);
+       rtl8723a_set_media_status(padapter, type);
 }
 
 inline u8 rtw_get_oper_ch23a(struct rtw_adapter *adapter)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 26efc706997747724734a0cef6e5b01a3369a686..d6afc049548fb79fc3d63d60f95a0fa0a7f203db 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3135,14 +3135,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
        u32 *val32 = (u32 *)val;
 
        switch (variable) {
-       case HW_VAR_MEDIA_STATUS:
-               rtl8723a_set_media_status(padapter, *val);
-               break;
-
-       case HW_VAR_MEDIA_STATUS1:
-               rtl8723a_set_media_status1(padapter, *val);
-               break;
-
        case HW_VAR_SET_OPMODE:
                hw_var_set_opmode(padapter, *val);
                break;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index a5306e618f9a604eaa2e5c90cebb52e3a054a837..c4a1869527e752e52f8aadc14903794c8bbd9282 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -36,8 +36,6 @@ enum _CHIP_TYPE {
 };
 
 enum HW_VARIABLES {
-       HW_VAR_MEDIA_STATUS,
-       HW_VAR_MEDIA_STATUS1,
        HW_VAR_SET_OPMODE,
        HW_VAR_MAC_ADDR,
        HW_VAR_BSSID,