staging: r8188eu: rename GetHalDefVar8188EUsb to rtw_hal_get_def_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 cff9b1bc8748c3e92d287c34ed2c9cc11cb1347a..1cc8674e06e009854a177d7da4e2edb5cd38250a 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -126,14 +126,6 @@ void rtw_hal_get_hwreg(struct adapter *adapt, u8 variable, u8 *val)
                adapt->HalFunc.GetHwRegHandler(adapt, variable, val);
 }
 
-u8 rtw_hal_get_def_var(struct adapter *adapt,
-                      enum hal_def_variable var, void *val)
-{
-       if (adapt->HalFunc.GetHalDefVarHandler)
-               return adapt->HalFunc.GetHalDefVarHandler(adapt, var, val);
-       return _FAIL;
-}
-
 void rtw_hal_set_odm_var(struct adapter *adapt,
                         enum hal_odm_variable var, void *val1,
                         bool set)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 841f691155b3a95e53a15f2d333562ced7544fca..6fa7158ceb5358ed36b09ededbeefae68e45c28f 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1838,8 +1838,7 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
 /*     Description: */
 /*             Query setting of specified variable. */
 /*  */
-static u8
-GetHalDefVar8188EUsb(
+u8 rtw_hal_get_def_var(
                struct adapter *Adapter,
                enum hal_def_variable eVariable,
                void *pValue
@@ -2082,7 +2081,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
 
        halfunc->SetHwRegHandler = &SetHwReg8188EU;
        halfunc->GetHwRegHandler = &GetHwReg8188EU;
-       halfunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;
 
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index c56f701e8fe14863ad6edea6c1f14e7d1b6de2ae..5f89bdca97dc56a63370065f296bbdde34a36e60 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -180,10 +180,6 @@ struct hal_ops {
        void    (*GetHwRegHandler)(struct adapter *padapter, u8 variable,
                                   u8 *val);
 
-       u8      (*GetHalDefVarHandler)(struct adapter *padapter,
-                                      enum hal_def_variable eVariable,
-                                      void *pValue);
-
        void    (*SetHalODMVarHandler)(struct adapter *padapter,
                                       enum hal_odm_variable eVariable,
                                       void *pValue1, bool bSet);