staging: rtl8723au: Kill off ugly GetHwReg*() interface

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

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index cafe347de63b4bd8eb5a02adf63bef631216f94f..04cc53424b51e73f70b34fa5f5544519faba33d3 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -117,12 +117,6 @@ uint rtw_hal_deinit23a(struct rtw_adapter *padapter)
        return status;
 }
 
-void rtw23a_hal_get_hwreg(struct rtw_adapter *padapter, u8 variable, u8 *val)
-{
-       if (padapter->HalFunc.GetHwRegHandler)
-               padapter->HalFunc.GetHwRegHandler(padapter, variable, val);
-}
-
 u8 rtw_hal_set_def_var23a(struct rtw_adapter *padapter, enum hal_def_variable eVariable, void *pValue)
 {
        if (padapter->HalFunc.SetHalDefVarHandler)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 9967c075a702c7f9c3ef0ebdb20822a9e308a0d2..8ea00ba851a20596f5668c0058c10dfbfe2e59a0 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -3132,12 +3132,6 @@ void hw_var_set_mlme_join(struct rtw_adapter *padapter, u8 type)
 #endif
 }
 
-void GetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val)
-{
-       switch (variable) {
-       }
-}
-
 #ifdef CONFIG_8723AU_BT_COEXIST
 
 void rtl8723a_SingleDualAntennaDetection(struct rtw_adapter *padapter)

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 53ef7c39eae5c972dc7f0aee9284416582c26c8d..0a6e343373ffd06f977e7d789fc3cd6bc515494c 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -1496,15 +1496,6 @@ static void ReadAdapterInfo8723AU(struct rtw_adapter *Adapter)
        _ReadAdapterInfo8723AU(Adapter);
 }
 
-/*
- * If variable not handled here,
- * some variables will be processed in GetHwReg8723A()
- */
-static void GetHwReg8723AU(struct rtw_adapter *Adapter, u8 variable, u8 *val)
-{
-       GetHwReg8723A(Adapter, variable, val);
-}
-
 /*  */
 /*     Description: */
 /*             Query setting of specified variable. */
@@ -1782,7 +1773,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
        pHalFunc->init_default_value = &rtl8723au_init_default_value;
        pHalFunc->intf_chip_configure = &rtl8723au_interface_configure;
        pHalFunc->read_adapter_info = &ReadAdapterInfo8723AU;
-       pHalFunc->GetHwRegHandler = &GetHwReg8723AU;
        pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;
        pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb;
        pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index e5b71ca639dc574a21ca315a1330f061fd0c6a6e..0284ec054d0da631928e3e77fc3a28746926fa38 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -123,9 +123,6 @@ struct hal_ops {
 
        void (*hal_dm_watchdog)(struct rtw_adapter *padapter);
 
-       void (*GetHwRegHandler)(struct rtw_adapter *padapter,
-                               u8 variable, u8 *val);
-
        u8 (*GetHalDefVarHandler)(struct rtw_adapter *padapter,
                                  enum hal_def_variable eVariable,
                                  void *pValue);
@@ -258,7 +255,6 @@ u32 rtw_hal_power_on23a(struct rtw_adapter *padapter);
 uint rtw_hal_init23a(struct rtw_adapter *padapter);
 uint rtw_hal_deinit23a(struct rtw_adapter *padapter);
 void rtw_hal_stop(struct rtw_adapter *padapter);
-void rtw23a_hal_get_hwreg(struct rtw_adapter *padapter, u8 variable, u8 *val);
 
 void rtw_hal_chip_configure23a(struct rtw_adapter *padapter);
 void rtw_hal_read_chip_info23a(struct rtw_adapter *padapter);

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index 49d743dc68de19e4c4bd67a4e36f6216467daf69..ce11245fefd76247e71eae84e013e20048cbb5f0 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -548,7 +548,6 @@ void Hal_EfuseParseThermalMeter_8723A(struct rtw_adapter *padapter, u8 *hwinfo,
 void Hal_InitChannelPlan23a(struct rtw_adapter *padapter);
 
 void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc);
-void GetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val);
 #ifdef CONFIG_8723AU_BT_COEXIST
 void rtl8723a_SingleDualAntennaDetection(struct rtw_adapter *padapter);
 #endif