staging: r8188eu: rename sreset_init_value to rtw_hal_sreset_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/core/rtw_sreset.c b/drivers/staging/rtl8188eu/core/rtw_sreset.c
index 13a5bf4730abd9a5ddca7805ead734393274d4bc..5d631c515bf0c547e4c9b28d4f33ca89acba41ee 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_sreset.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c
@@ -16,7 +16,7 @@
 #include <rtw_sreset.h>
 #include <usb_ops_linux.h>
 
-void sreset_init_value(struct adapter *padapter)
+void rtw_hal_sreset_init(struct adapter *padapter)
 {
        struct hal_data_8188e   *pHalData = GET_HAL_DATA(padapter);
        struct sreset_priv *psrtpriv = &pHalData->srestpriv;

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index a4696b08b8dc512e200be7d127587d4a727e7460..adceade53d2a20255c24ea2c8623a98b78ccd5e4 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -150,12 +150,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *adapt,
                adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);
 }
 
-void rtw_hal_sreset_init(struct adapter *adapt)
-{
-       if (adapt->HalFunc.sreset_init_value)
-               adapt->HalFunc.sreset_init_value(adapt);
-}
-
 void rtw_hal_reset_security_engine(struct adapter *adapter)
 {
        if (adapter->HalFunc.hal_reset_security_engine)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index c123f4e2da1f5c8c3426f862922b4f8ee5573b48..ea46ea76a302bf585e5e4915c77c32d70ca73754 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -203,8 +203,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;
        pHalFunc->AntDivCompareHandler = &AntDivCompare8188E;
        pHalFunc->read_rfreg = &phy_query_rf_reg;
-
-       pHalFunc->sreset_init_value = &sreset_init_value;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index c1d4879c12b459ec434fa429d47e5a5c9f3016fc..971fc629b06453da9c75ec77bcb105a64a371cc4 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -165,8 +165,6 @@ struct hal_ops {
                              enum rf_radio_path eRFPath, u32 RegAddr,
                              u32 BitMask);
 
-       void (*sreset_init_value)(struct adapter *padapter);
-
        void (*hal_reset_security_engine)(struct adapter *adapter);
 };
 

diff --git a/drivers/staging/rtl8188eu/include/rtw_sreset.h b/drivers/staging/rtl8188eu/include/rtw_sreset.h
index ce027dfdecc58d2907e8a606054e5613b0e7573d..4c4ccd5648634a297e3da7d15a18aaefcad369ea 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_sreset.h
+++ b/drivers/staging/rtl8188eu/include/rtw_sreset.h
@@ -33,7 +33,6 @@ struct sreset_priv {
 #define        WIFI_RX_HANG                    BIT(5)
 #define                WIFI_IF_NOT_EXIST       BIT(6)
 
-void sreset_init_value(struct adapter *padapter);
 u8 sreset_get_wifi_status(struct adapter *padapter);
 void sreset_set_wifi_error_status(struct adapter *padapter, u32 status);