staging: r8188eu: remove inirp_init from struct hal_ops

Remove inirp_init from struct hal_ops and remove its wrapper
rtw_hal_inirp_init(). Call rtl8188eu_inirp_init() directly instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210929192657.9569-7-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 039723d62ae1863020ed30e7d7368153e6130244..ca7f0bcdb4d5fae475dad5d1e29d31051485da1a 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -53,17 +53,6 @@ void rtw_hal_get_hwreg(struct adapter *adapt, u8 variable, u8 *val)
                adapt->HalFunc.GetHwRegHandler(adapt, variable, val);
 }
 
-u32 rtw_hal_inirp_init(struct adapter *adapt)
-{
-       u32 rst = _FAIL;
-
-       if (adapt->HalFunc.inirp_init)
-               rst = adapt->HalFunc.inirp_init(adapt);
-       else
-               DBG_88E(" %s HalFunc.inirp_init is NULL!!!\n", __func__);
-       return rst;
-}
-
 u32 rtw_hal_inirp_deinit(struct adapter *adapt)
 {
        if (adapt->HalFunc.inirp_deinit)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index bdadd801693f0d1a35d6a967ac41c70825a2f916..6211589009189c9d9a1983355858183f7dc93ff9 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -997,7 +997,7 @@ static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
        return _SUCCESS;
  }
 
-static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
+unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
 {
        u8 i;
        struct recv_buf *precvbuf;
@@ -2150,7 +2150,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->hal_init = &rtl8188eu_hal_init;
        halfunc->hal_deinit = &rtl8188eu_hal_deinit;
 
-       halfunc->inirp_init = &rtl8188eu_inirp_init;
        halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;
 
        halfunc->SetHwRegHandler = &SetHwReg8188EU;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 2f8c62ebf6b731f0d8331d2c2e746731ba3013f9..4eb9fb81f1685070d191a01a13b59185608b563f 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -125,7 +125,6 @@ struct hal_ops {
        u32     (*hal_init)(struct adapter *padapter);
        u32     (*hal_deinit)(struct adapter *padapter);
 
-       u32     (*inirp_init)(struct adapter *padapter);
        u32     (*inirp_deinit)(struct adapter *padapter);
 
        void    (*SetHwRegHandler)(struct adapter *padapter, u8 variable,
@@ -174,13 +173,14 @@ int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter,
 u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue);
 u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariable, void *pValue);
 
+unsigned int rtl8188eu_inirp_init(struct adapter *Adapter);
+
 uint rtw_hal_init(struct adapter *padapter);
 uint rtw_hal_deinit(struct adapter *padapter);
 void rtw_hal_stop(struct adapter *padapter);
 void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val);
 void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val);
 
-u32    rtw_hal_inirp_init(struct adapter *padapter);
 u32    rtw_hal_inirp_deinit(struct adapter *padapter);
 
 void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index b2cc9060b8ce9e32c16a3f286fed7db40f374e39..a36398774ee5c9061ce3810fecf1193c23ff919b 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -180,7 +180,7 @@ static void chip_by_usb_id(struct adapter *padapter)
 
 static void usb_intf_start(struct adapter *padapter)
 {
-       rtw_hal_inirp_init(padapter);
+       rtl8188eu_inirp_init(padapter);
 }
 
 static void usb_intf_stop(struct adapter *padapter)