staging: r8188eu: remove init_xmit_priv from struct hal_ops

Remove init_xmit_priv from struct hal_ops an remove its wrapper
rtw_hal_init_xmit_priv(). Call rtl8188eu_init_xmit_priv() directly
instead.

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

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 896ed91..bd11270 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -200,7 +200,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
        mutex_init(&pxmitpriv->ack_tx_mutex);
        rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0);
 
-       rtw_hal_init_xmit_priv(padapter);
+       rtl8188eu_init_xmit_priv(padapter);
 
 exit:
 

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index f72978e..ff06307 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -72,13 +72,6 @@ u32 rtw_hal_inirp_deinit(struct adapter *adapt)
        return _FAIL;
 }
 
-s32 rtw_hal_init_xmit_priv(struct adapter *adapt)
-{
-       if (adapt->HalFunc.init_xmit_priv)
-               return adapt->HalFunc.init_xmit_priv(adapt);
-       return _FAIL;
-}
-
 s32 rtw_hal_init_recv_priv(struct adapter *adapt)
 {
        if (adapt->HalFunc.init_recv_priv)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index cebad55..93733c5 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -2153,8 +2153,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->inirp_init = &rtl8188eu_inirp_init;
        halfunc->inirp_deinit = &rtl8188eu_inirp_deinit;
 
-       halfunc->init_xmit_priv = &rtl8188eu_init_xmit_priv;
-
        halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;
        halfunc->free_recv_priv = &rtl8188eu_free_recv_priv;
 

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 22a52d2..915f16f 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -128,8 +128,6 @@ struct hal_ops {
        u32     (*inirp_init)(struct adapter *padapter);
        u32     (*inirp_deinit)(struct adapter *padapter);
 
-       s32     (*init_xmit_priv)(struct adapter *padapter);
-
        s32     (*init_recv_priv)(struct adapter *padapter);
        void    (*free_recv_priv)(struct adapter *padapter);
 
@@ -188,8 +186,6 @@ 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);
 
-s32    rtw_hal_init_xmit_priv(struct adapter *padapter);
-
 s32    rtw_hal_init_recv_priv(struct adapter *padapter);
 void   rtw_hal_free_recv_priv(struct adapter *padapter);