staging: r8188eu: rename rtl8188eu_mgnt_xmit to rtw_hal_mgnt_xmit

And remove many 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 085f0fbd0c43e673896d40718708ab9a013621ca..57452306124c63f9d277ca9613de9f146c1a2861 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -170,15 +170,6 @@ s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe)
        return false;
 }
 
-s32 rtw_hal_mgnt_xmit(struct adapter *adapt, struct xmit_frame *pmgntframe)
-{
-       s32 ret = _FAIL;
-
-       if (adapt->HalFunc.mgnt_xmit)
-               ret = adapt->HalFunc.mgnt_xmit(adapt, pmgntframe);
-       return ret;
-}
-
 s32 rtw_hal_init_xmit_priv(struct adapter *adapt)
 {
        if (adapt->HalFunc.init_xmit_priv)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
index 88d1dadefcb58e8b5c4553743c55736ae31832e3..48386d054f93e9bfd4fcc3dd8dda5bf00fd0cc05 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
@@ -672,7 +672,7 @@ enqueue:
        return false;
 }
 
-s32 rtl8188eu_mgnt_xmit(struct adapter *adapt, struct xmit_frame *pmgntframe)
+s32 rtw_hal_mgnt_xmit(struct adapter *adapt, struct xmit_frame *pmgntframe)
 {
        struct xmit_priv *xmitpriv = &adapt->xmitpriv;
 

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 03c143fba56b81825e7e7cb0228b10be3cdfaf56..a99d316e42383d979badca8d200a0a2fe588e385 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2088,7 +2088,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb;
 
        halfunc->hal_xmit = &rtl8188eu_hal_xmit;
-       halfunc->mgnt_xmit = &rtl8188eu_mgnt_xmit;
 
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index eaf939bd4103c85dc4b7511199c5f1f13f8a4f41..bb61a0fde83ca1a132e7180aad8b2e6409333066 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -201,8 +201,6 @@ struct hal_ops {
                                        struct wlan_bssid_ex *src);
        s32     (*hal_xmit)(struct adapter *padapter,
                            struct xmit_frame *pxmitframe);
-       s32 (*mgnt_xmit)(struct adapter *padapter,
-                        struct xmit_frame *pmgntframe);
        u32     (*read_rfreg)(struct adapter *padapter,
                              enum rf_radio_path eRFPath, u32 RegAddr,
                              u32 BitMask);

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
index 97942c5816a531307fcb489fb520b1f338d337ce..b9ebb6607b04449409aeb6196f4ab61311a06ecf 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h
@@ -155,7 +155,6 @@ void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc,
                               u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull);
 s32 rtl8188eu_init_xmit_priv(struct adapter *padapter);
 s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *frame);
-s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *frame);
 s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);
 #define hal_xmit_handler rtl8188eu_xmit_buf_handler
 void rtl8188eu_xmit_tasklet(void *priv);