staging: r8188eu: rename rtl8188eu_init_default_value to rtw_hal_def_value_init

And remove two 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 214b978..805f3ad 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -25,12 +25,6 @@ void rtw_hal_read_chip_version(struct adapter *adapt)
                adapt->HalFunc.read_chip_version(adapt);
 }
 
-void rtw_hal_def_value_init(struct adapter *adapt)
-{
-       if (adapt->HalFunc.init_default_value)
-               adapt->HalFunc.init_default_value(adapt);
-}
-
 void rtw_hal_free_data(struct adapter *adapt)
 {
        if (adapt->HalFunc.free_hal_data)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index ff4e95d..bbc385e 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2029,7 +2029,7 @@ void rtw_hal_bcn_related_reg_setting(struct adapter *adapt)
        usb_write8(adapt, bcn_ctrl_reg, usb_read8(adapt, bcn_ctrl_reg) | BIT(1));
 }
 
-static void rtl8188eu_init_default_value(struct adapter *adapt)
+void rtw_hal_def_value_init(struct adapter *adapt)
 {
        struct hal_data_8188e *haldata;
        struct pwrctrl_priv *pwrctrlpriv;
@@ -2075,7 +2075,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->InitSwLeds = &rtl8188eu_InitSwLeds;
        halfunc->DeInitSwLeds = &rtl8188eu_DeInitSwLeds;
 
-       halfunc->init_default_value = &rtl8188eu_init_default_value;
-
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index dd3fc79..58b4ee3 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -160,8 +160,6 @@ struct hal_ops {
        void    (*dm_init)(struct adapter *padapter);
        void    (*read_chip_version)(struct adapter *padapter);
 
-       void    (*init_default_value)(struct adapter *padapter);
-
        s32     (*interrupt_handler)(struct adapter *padapter);
 
        void    (*set_bwmode_handler)(struct adapter *padapter,