staging: r8188eu: rename rtl8188e_SetHalODMVar to rtw_hal_set_odm_var

And remove many one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index eb93008..a4696b0 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -77,15 +77,6 @@ uint rtw_hal_deinit(struct adapter *adapt)
        return status;
 }
 
-void rtw_hal_set_odm_var(struct adapter *adapt,
-                        enum hal_odm_variable var, void *val1,
-                        bool set)
-{
-       if (adapt->HalFunc.SetHalODMVarHandler)
-               adapt->HalFunc.SetHalODMVarHandler(adapt, var,
-                                                     val1, set);
-}
-
 void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)
 {
        struct mlme_priv *pmlmepriv = &(adapt->mlmepriv);

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 7ef47c1..10b679c 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -145,7 +145,7 @@ static void ReadChipVersion8188E(struct adapter *padapter)
        MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);
 }
 
-static void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
+void rtw_hal_set_odm_var(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
 {
        struct hal_data_8188e   *pHalData = GET_HAL_DATA(Adapter);
        struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
@@ -206,8 +206,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 
        pHalFunc->sreset_init_value = &sreset_init_value;
        pHalFunc->sreset_get_wifi_status  = &sreset_get_wifi_status;
-
-       pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 429b0ac..6cbe58f 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -154,10 +154,6 @@ struct hal_ops {
 
        void    (*hal_dm_watchdog)(struct adapter *padapter);
 
-       void    (*SetHalODMVarHandler)(struct adapter *padapter,
-                                      enum hal_odm_variable eVariable,
-                                      void *pValue1, bool bSet);
-
        void    (*Add_RateATid)(struct adapter *adapter, u32 bitmap, u8 arg,
                                u8 rssi_level);