staging: r8188eu: remove GetHalODMVarHandler from hal_ops

Remove GetHalODMVarHandler from hal_ops ant remove its wrapper
rtw_hal_get_odm_var(), both are unused.

Acked-by: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210904124033.14244-6-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 1a59644679f15b6e5912bf547316b64b1f59f8d5..9069b52f83ff44971437115e8fed330520ac11fd 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -124,15 +124,6 @@ void rtw_hal_set_odm_var(struct adapter *adapt,
                                                      val1, set);
 }
 
-void rtw_hal_get_odm_var(struct adapter *adapt,
-                        enum hal_odm_variable var, void *val1,
-                        bool set)
-{
-       if (adapt->HalFunc.GetHalODMVarHandler)
-               adapt->HalFunc.GetHalODMVarHandler(adapt, var,
-                                                     val1, set);
-}
-
 void rtw_hal_enable_interrupt(struct adapter *adapt)
 {
        if (adapt->HalFunc.enable_interrupt)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 64a0223f0ee06499d7d0e4524bcda17399872d8f..09f7bc010ba79bc1b58f85ca388bd1a4dbc26be5 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1728,10 +1728,6 @@ void rtl8188e_read_chip_version(struct adapter *padapter)
        MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);
 }
 
-static void rtl8188e_GetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
-{
-}
-
 static void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
 {
        struct hal_data_8188e   *pHalData = GET_HAL_DATA(Adapter);
@@ -1823,7 +1819,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->sreset_linked_status_check  = &rtl8188e_sreset_linked_status_check;
        pHalFunc->sreset_get_wifi_status  = &sreset_get_wifi_status;
 
-       pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar;
        pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar;
 
        pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 7046f4b222b65e1f0b904aa3a9090b0e3efe5e85..d5cf9b0d9a770b7c58f5ef9c011051985c201f3b 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -174,9 +174,6 @@ struct hal_ops {
                                       enum hal_def_variable eVariable,
                                       void *pValue);
 
-       void    (*GetHalODMVarHandler)(struct adapter *padapter,
-                                      enum hal_odm_variable eVariable,
-                                      void *pValue1, bool bSet);
        void    (*SetHalODMVarHandler)(struct adapter *padapter,
                                       enum hal_odm_variable eVariable,
                                       void *pValue1, bool bSet);
@@ -290,9 +287,6 @@ u8 rtw_hal_get_def_var(struct adapter *padapter,
 void rtw_hal_set_odm_var(struct adapter *padapter,
                         enum hal_odm_variable eVariable, void *pValue1,
                         bool bSet);
-void rtw_hal_get_odm_var(struct adapter *padapter,
-                        enum hal_odm_variable eVariable,
-                        void *pValue1, bool bSet);
 
 void rtw_hal_enable_interrupt(struct adapter *padapter);
 void rtw_hal_disable_interrupt(struct adapter *padapter);