staging: r8188eu: rename rtl8188eu_init_xmit_priv to rtw_hal_init_xmit_priv

 And remove two one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index 793b42fb374b32f19c21be2055db8ea7e40347c0..b1ab8e8791e64e971c1bc18de6c3bd3c34aba0e8 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -112,13 +112,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;
-}
-
 void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)
 {
        struct mlme_priv *pmlmepriv = &(adapt->mlmepriv);

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
index f2c8f7a2c64e31e596fee67aee6b29c14d35c28b..3e6f5ca5e5c22fbb65600582313545d3f3d3a3db 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
@@ -21,7 +21,7 @@
 #include <usb_ops_linux.h>
 #include <rtl8188e_hal.h>
 
-s32    rtl8188eu_init_xmit_priv(struct adapter *adapt)
+s32 rtw_hal_init_xmit_priv(struct adapter *adapt)
 {
        struct xmit_priv        *pxmitpriv = &adapt->xmitpriv;
 

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index bfdc37225cf510b305dd7b2d3f6816621a7a4763..d73f560e483e91e10ce926f5cab31457a768fbca 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2068,7 +2068,5 @@ 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;
-
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index aed7b611d064dffd4df936c40192f1c441c22fde..f3c7e4c1623e39f8b2cc66e1c3d6c940fe6b153a 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -149,8 +149,6 @@ struct hal_ops {
        u32     (*inirp_init)(struct adapter *padapter);
        u32     (*inirp_deinit)(struct adapter *padapter);
 
-       s32     (*init_xmit_priv)(struct adapter *padapter);
-
        void    (*dm_init)(struct adapter *padapter);
        void    (*read_chip_version)(struct adapter *padapter);