staging: r8188eu: rename rtl8188eu_free_recv_priv to rtw_hal_free_recv_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 afab8359d0e485318a82753813ae412105722f1d..2afc116495f708aa78e249b8bac18ac1c554297a 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -127,12 +127,6 @@ s32 rtw_hal_init_recv_priv(struct adapter *adapt)
        return _FAIL;
 }
 
-void rtw_hal_free_recv_priv(struct adapter *adapt)
-{
-       if (adapt->HalFunc.free_recv_priv)
-               adapt->HalFunc.free_recv_priv(adapt);
-}
-
 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_recv.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
index 093a998f27010d65b02f5b6cdad18dd72103738a..7e9b2dd616558c9e2702e1418d7e269bdd77bd7e 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
@@ -89,7 +89,7 @@ exit:
        return res;
 }
 
-void rtl8188eu_free_recv_priv(struct adapter *padapter)
+void rtw_hal_free_recv_priv(struct adapter *padapter)
 {
        int     i;
        struct recv_buf *precvbuf;

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 662281dd9321122b8f8b23e85cf69f595ca95ea1..66072e2b24bd025cb94a580ff730c3116b8d23ec 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2071,7 +2071,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->init_xmit_priv = &rtl8188eu_init_xmit_priv;
 
        halfunc->init_recv_priv = &rtl8188eu_init_recv_priv;
-       halfunc->free_recv_priv = &rtl8188eu_free_recv_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 6cddfd48eb0aef611a9ee9e4250e04b29618e8eb..23a473812d4a915b895976b9fe1c48197958d8b0 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -152,7 +152,6 @@ struct hal_ops {
        s32     (*init_xmit_priv)(struct adapter *padapter);
 
        s32     (*init_recv_priv)(struct adapter *padapter);
-       void    (*free_recv_priv)(struct adapter *padapter);
 
        void    (*dm_init)(struct adapter *padapter);
        void    (*read_chip_version)(struct adapter *padapter);

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_recv.h b/drivers/staging/rtl8188eu/include/rtl8188e_recv.h
index 54048bc826e5ab1eb5c421800a003a192d9f91a5..623fe64828027549d58870e476533a49858b5a42 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_recv.h
@@ -52,7 +52,6 @@ enum rx_packet_type {
 
 #define INTERRUPT_MSG_FORMAT_LEN 60
 s32 rtl8188eu_init_recv_priv(struct adapter *padapter);
-void rtl8188eu_free_recv_priv(struct adapter *padapter);
 void rtl8188eu_recv_hdl(struct adapter *padapter, struct recv_buf *precvbuf);
 void rtl8188eu_recv_tasklet(void *priv);
 void rtl8188e_query_rx_phy_status(struct recv_frame *fr, struct phy_stat *phy);