staging: r8188eu: rename rtl8188e_free_hal_data to rtw_hal_free_data

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 094c4542a68268aebffb5c94c6044eec7ef6384e..d76ccd0eb1e5756b92ff5f9a84f5cde7862d7c7d 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -19,12 +19,6 @@
 #include <hal_intf.h>
 #include <usb_hal.h>
 
-void rtw_hal_free_data(struct adapter *adapt)
-{
-       if (adapt->HalFunc.free_hal_data)
-               adapt->HalFunc.free_hal_data(adapt);
-}
-
 uint    rtw_hal_init(struct adapter *adapt)
 {
        uint    status = _SUCCESS;

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index d1f89f867732cd3442c4bda47018869777c59cf7..85794cbdb8bff6d1e336998355319cc2070ff61d 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -117,7 +117,7 @@ void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)
        pHalData->LastHMEBoxNum = 0;
 }
 
-static void rtl8188e_free_hal_data(struct adapter *padapter)
+void rtw_hal_free_data(struct adapter *padapter)
 {
        kfree(padapter->HalData);
        padapter->HalData = NULL;
@@ -187,7 +187,6 @@ void rtw_hal_notch_filter(struct adapter *adapter, bool enable)
 }
 void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 {
-       pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 0228c374c66732f8beeb578cd14bb6d750396b1a..9b3528a48e95c4da37dd3df3c726bd5e5f7a9e54 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -140,8 +140,6 @@ enum hal_intf_ps_func {
 };
 
 struct hal_ops {
-       void    (*free_hal_data)(struct adapter *padapter);
-
        s32     (*interrupt_handler)(struct adapter *padapter);
 
        void (*hal_reset_security_engine)(struct adapter *adapter);