summaryrefslogtreecommitdiff
path: root/drivers/staging/r8188eu/hal
diff options
context:
space:
mode:
authorMichael Straube <straube.linux@gmail.com>2021-10-07 12:39:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-10 14:56:42 +0200
commitb66d42066f64b1f5f27164e1afe2441b0fe377b0 (patch)
treed5d7798653986ac0a0f45492477971f981e0173f /drivers/staging/r8188eu/hal
parent9c44c0f6da146f2ae2a7d84caacdef09acac2784 (diff)
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>
Diffstat (limited to 'drivers/staging/r8188eu/hal')
-rw-r--r--drivers/staging/r8188eu/hal/hal_intf.c2
-rw-r--r--drivers/staging/r8188eu/hal/usb_halinit.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 6f39fc04df9b..30ddf174e4df 100644
--- 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 78a7e454f598..2f0f2ff45795 100644
--- 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;
}