staging: r8188eu: remove hal_init from hal_ops

Remove hal_init from struct hal_ops and call rtl8188eu_hal_init()
directly.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211007103943.8433-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 6f39fc04df9bd47c16d242d3c3c3e8d20c215a9d..30ddf174e4dfaecaff3fab56d5d403ebcc075def 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -12,7 +12,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/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 78a7e454f5986943464dd8d88bdff592aa21d64b..2f0f2ff45795b246ba872adcb81b46d806917b1e 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -617,7 +617,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;
@@ -2100,6 +2100,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
                DBG_88E("cant not alloc memory for HAL DATA\n");
        adapt->hal_data_sz = sizeof(struct hal_data_8188e);
 
-       halfunc->hal_init = &rtl8188eu_hal_init;
        halfunc->hal_deinit = &rtl8188eu_hal_deinit;
 }

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index e2003824e70b1c1cdb6fa19267bbd3cbb8ccc18e..785aec3d3ea333de8940934ab4ee1d61ba40ec37 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -105,7 +105,6 @@ enum hal_odm_variable {
 typedef s32 (*c2h_id_filter)(u8 id);
 
 struct hal_ops {
-       u32     (*hal_init)(struct adapter *padapter);
        u32     (*hal_deinit)(struct adapter *padapter);
 };
 
@@ -156,6 +155,8 @@ uint rtw_hal_init(struct adapter *padapter);
 uint rtw_hal_deinit(struct adapter *padapter);
 void rtw_hal_stop(struct adapter *padapter);
 
+u32 rtl8188eu_hal_init(struct adapter *Adapter);
+
 void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);
 void   rtw_hal_clone_data(struct adapter *dst_adapt,
                           struct adapter *src_adapt);