staging: rtl8723au: Disentangle recv/xmit_priv init/free from HAL wrappers

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_recv.c b/drivers/staging/rtl8723au/core/rtw_recv.c
index 014bb54c1a13b45908f0cae46ea465baa6f7eea3..6d98531a9c3160600d53d452cd4093e53034c620 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_recv.c
+++ b/drivers/staging/rtl8723au/core/rtw_recv.c
@@ -22,6 +22,7 @@
 #include <usb_ops.h>
 #include <linux/ieee80211.h>
 #include <wifi.h>
+#include <rtl8723a_recv.h>
 
 void rtw_signal_stat_timer_hdl23a(unsigned long data);
 
@@ -72,7 +73,7 @@ int _rtw_init_recv_priv23a(struct recv_priv *precvpriv,
        precvpriv->free_recvframe_cnt = i;
        precvpriv->rx_pending_cnt = 1;
 
-       res = rtw_hal_init23a_recv_priv(padapter);
+       res = rtl8723au_init_recv_priv(padapter);
 
        setup_timer(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl23a,
                    (unsigned long)padapter);
@@ -98,7 +99,7 @@ void _rtw_free_recv_priv23a (struct recv_priv *precvpriv)
                kfree(precvframe);
        }
 
-       rtw_hal_free_recv_priv23a(padapter);
+       rtl8723au_free_recv_priv(padapter);
 }
 
 struct recv_frame *rtw_alloc_recvframe23a(struct rtw_queue *pfree_recv_queue)

diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
index 99589c467d8efe80755ec54602822fa75588805e..c6a6567ba6f257d6e9000ef4a5eddfd4e3da946c 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
@@ -194,7 +194,9 @@ int _rtw_init_xmit_priv23a(struct xmit_priv *pxmitpriv,
        pxmitpriv->ack_tx = false;
        mutex_init(&pxmitpriv->ack_tx_mutex);
        rtw_sctx_init23a(&pxmitpriv->ack_tx_ops, 0);
-       rtw_hal_init23a_xmit_priv(padapter);
+       tasklet_init(&padapter->xmitpriv.xmit_tasklet,
+                    (void(*)(unsigned long))rtl8723au_xmit_tasklet,
+                    (unsigned long)padapter);
 
 exit:
 

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index 50d8ca3dfcd3de824da038287305f8c1f65e04d2..7346f300574ce035ad8004ead3c49abf49554fd9 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -95,26 +95,6 @@ s32  rtw_hal_mgnt_xmit23a(struct rtw_adapter *padapter, struct xmit_frame *pmgntf
        return ret;
 }
 
-s32    rtw_hal_init23a_xmit_priv(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.init_xmit_priv != NULL)
-               return padapter->HalFunc.init_xmit_priv(padapter);
-       return _FAIL;
-}
-
-s32    rtw_hal_init23a_recv_priv(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.init_recv_priv)
-               return padapter->HalFunc.init_recv_priv(padapter);
-
-       return _FAIL;
-}
-void   rtw_hal_free_recv_priv23a(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.free_recv_priv)
-               padapter->HalFunc.free_recv_priv(padapter);
-}
-
 void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level)
 {
        struct rtw_adapter *padapter;

diff --git a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
index ed8aeb447be759309f4cef25e01c6705c311dd27..da6bda04956760675845bf30556ea557fbc17daf 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
@@ -21,16 +21,6 @@
 /* include <rtl8192c_hal.h> */
 #include <rtl8723a_hal.h>
 
-s32    rtl8723au_init_xmit_priv(struct rtw_adapter *padapter)
-{
-       struct xmit_priv        *pxmitpriv = &padapter->xmitpriv;
-
-       tasklet_init(&pxmitpriv->xmit_tasklet,
-            (void(*)(unsigned long))rtl8723au_xmit_tasklet,
-            (unsigned long)padapter);
-       return _SUCCESS;
-}
-
 static void do_queue_select(struct rtw_adapter *padapter, struct pkt_attrib *pattrib)
 {
        u8 qsel;

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index e3e7153205f804fe28c4dc86ed2773852b755c74..3ed766bea5cdd7f5d742eb2d7daf7f8e1df1c649 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -1773,10 +1773,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
                return -ENOMEM;
        }
 
-       pHalFunc->init_xmit_priv = &rtl8723au_init_xmit_priv;
-
-       pHalFunc->init_recv_priv = &rtl8723au_init_recv_priv;
-       pHalFunc->free_recv_priv = &rtl8723au_free_recv_priv;
        pHalFunc->InitSwLeds = NULL;
        pHalFunc->DeInitSwLeds = NULL;
 

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index fb5b8a72b1b76c4c2b6c5efa28e19407f94740ee..114063adc17eed94e4226bdf84eadf25df6553e4 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -63,11 +63,6 @@ enum hal_odm_variable {
 struct hal_ops {
        u32 (*hal_power_on)(struct rtw_adapter *padapter);
 
-       s32 (*init_xmit_priv)(struct rtw_adapter *padapter);
-
-       s32 (*init_recv_priv)(struct rtw_adapter *padapter);
-       void (*free_recv_priv)(struct rtw_adapter *padapter);
-
        void (*InitSwLeds)(struct rtw_adapter *padapter);
        void (*DeInitSwLeds)(struct rtw_adapter *padapter);
 
@@ -161,11 +156,6 @@ s32 rtw_hal_xmit23a(struct rtw_adapter *padapter,
 s32 rtw_hal_mgnt_xmit23a(struct rtw_adapter *padapter,
                         struct xmit_frame *pmgntframe);
 
-s32    rtw_hal_init23a_xmit_priv(struct rtw_adapter *padapter);
-
-s32    rtw_hal_init23a_recv_priv(struct rtw_adapter *padapter);
-void   rtw_hal_free_recv_priv23a(struct rtw_adapter *padapter);
-
 void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level);
 void   rtw_hal_clone_data(struct rtw_adapter *dst_padapter, struct rtw_adapter *src_padapter);
 

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_xmit.h b/drivers/staging/rtl8723au/include/rtl8723a_xmit.h
index 80e379c6b6fe356d06c2b4c0cd6463d6c32b7ad4..9b8438736b48cfb88158bc64556b835ae6c96fbe 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_xmit.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_xmit.h
@@ -219,7 +219,6 @@ void rtl8723a_fill_fake_txdesc(struct rtw_adapter *padapter, u8 *pDesc, u32 Buff
 s32    rtl8723au_hal_xmitframe_enqueue(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe);
 s32 rtl8723au_xmit_buf_handler(struct rtw_adapter *padapter);
 #define hal_xmit_handler rtl8723au_xmit_buf_handler
-s32    rtl8723au_init_xmit_priv(struct rtw_adapter * padapter);
 s32 rtl8723au_hal_xmit(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe);
 s32 rtl8723au_mgnt_xmit(struct rtw_adapter *padapter, struct xmit_frame *pmgntframe);
 s32 rtl8723au_xmitframe_complete(struct rtw_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);