staging: r8188eu: remove hal_init member of hal_ops structure

It is unnecessary wrapper for rtl8188eu_hal_init function.

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 cc71d85763065381d300707699e7e6f2b40d60c0..b239ffcc26df6a8e250a1ce711f8a8ce7713bbb7 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -50,7 +50,7 @@ uint   rtw_hal_init(struct adapter *adapt)
 
        adapt->hw_init_completed = false;
 
-       status = adapt->HalFunc.hal_init(adapt);
+       status = rtl8188eu_hal_init(adapt);
 
        if (status == _SUCCESS) {
                adapt->hw_init_completed = true;

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index d4bbccfca345720f2f4c7b97f65392cbc9e613e9..c5ea85290870393dcad12e5071494f3e0eeea3ec 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -672,7 +672,7 @@ enum rt_rf_power_state RfOnOffDetect(struct adapter *adapt)
        return rfpowerstate;
 }      /*  HalDetectPwrDownMode */
 
-static u32 rtl8188eu_hal_init(struct adapter *Adapter)
+u32 rtl8188eu_hal_init(struct adapter *Adapter)
 {
        u8 value8 = 0;
        u16  value16;
@@ -2051,7 +2051,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
                DBG_88E("cant not alloc memory for HAL DATA\n");
 
        halfunc->hal_power_on = rtl8188eu_InitPowerOn;
-       halfunc->hal_init = &rtl8188eu_hal_init;
 
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index f9de294f573f570b2c75c92fbeac3b2eaf565e6d..c4b28958c241e0e254d8c0b48c8278cd641191e8 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -141,7 +141,6 @@ enum hal_intf_ps_func {
 
 struct hal_ops {
        u32     (*hal_power_on)(struct adapter *padapter);
-       u32     (*hal_init)(struct adapter *padapter);
 
        void    (*free_hal_data)(struct adapter *padapter);
 
@@ -202,6 +201,7 @@ enum hardware_type {
 
 void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level);
 u32 rtl8188eu_hal_deinit(struct adapter *Adapter);
+u32 rtl8188eu_hal_init(struct adapter *Adapter);
 void rtw_hal_def_value_init(struct adapter *padapter);
 
 void   rtw_hal_free_data(struct adapter *padapter);