[PATCH 43/63] staging: r8188eu: remove hal_init member of hal_ops structure

From: Ivan Safonov
Date: Sat Sep 03 2016 - 11:40:29 EST


It is unnecessary wrapper for rtl8188eu_hal_init function.

Signed-off-by: Ivan Safonov <insafonov@xxxxxxxxx>
---
drivers/staging/rtl8188eu/hal/hal_intf.c | 2 +-
drivers/staging/rtl8188eu/hal/usb_halinit.c | 3 +--
drivers/staging/rtl8188eu/include/hal_intf.h | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index cc71d85..b239ffc 100644
--- 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 d4bbccf..c5ea852 100644
--- 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 f9de294..c4b2895 100644
--- 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);
--
2.7.3