From b3d139a6468047b87667c65d7ebc7c0c6b55ada6 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 16 May 2014 10:04:17 +0200 Subject: [PATCH] staging: rtl8723au: Disentangle recv/xmit_priv init/free from HAL wrappers Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/core/rtw_recv.c | 5 +++-- drivers/staging/rtl8723au/core/rtw_xmit.c | 4 +++- drivers/staging/rtl8723au/hal/hal_intf.c | 20 ------------------- .../staging/rtl8723au/hal/rtl8723au_xmit.c | 10 ---------- drivers/staging/rtl8723au/hal/usb_halinit.c | 4 ---- drivers/staging/rtl8723au/include/hal_intf.h | 10 ---------- .../staging/rtl8723au/include/rtl8723a_xmit.h | 1 - 7 files changed, 6 insertions(+), 48 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_recv.c b/drivers/staging/rtl8723au/core/rtw_recv.c index 014bb54c1a13..6d98531a9c31 100644 --- a/drivers/staging/rtl8723au/core/rtw_recv.c +++ b/drivers/staging/rtl8723au/core/rtw_recv.c @@ -22,6 +22,7 @@ #include #include #include +#include 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 99589c467d8e..c6a6567ba6f2 100644 --- 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 50d8ca3dfcd3..7346f300574c 100644 --- 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 ed8aeb447be7..da6bda049567 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c +++ b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c @@ -21,16 +21,6 @@ /* include */ #include -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 e3e7153205f8..3ed766bea5cd 100644 --- 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 fb5b8a72b1b7..114063adc17e 100644 --- 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 80e379c6b6fe..9b8438736b48 100644 --- 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); -- 2.39.5