From d095789ae66034c2991b398c5cf8e02ceff1bd88 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 9 May 2014 15:04:25 +0200 Subject: [PATCH] staging: rtl8723au: Remove empty *_free_xmit_priv() and friends Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/core/rtw_xmit.c | 2 -- drivers/staging/rtl8723au/hal/hal_intf.c | 5 ----- drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 4 ---- drivers/staging/rtl8723au/hal/usb_halinit.c | 1 - drivers/staging/rtl8723au/include/hal_intf.h | 2 -- drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 1 - 6 files changed, 15 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c index 5b1d35e71c93..99589c467d8e 100644 --- a/drivers/staging/rtl8723au/core/rtw_xmit.c +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c @@ -210,8 +210,6 @@ void _rtw_free_xmit_priv23a (struct xmit_priv *pxmitpriv) struct xmit_buf *pxmitbuf; struct list_head *plist, *ptmp; - rtw_hal_free_xmit_priv23a(padapter); - list_for_each_safe(plist, ptmp, &pxmitpriv->free_xmit_queue.queue) { pxframe = container_of(plist, struct xmit_frame, list); list_del_init(&pxframe->list); diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c index d22c62c83cb1..afd4e1f9b079 100644 --- a/drivers/staging/rtl8723au/hal/hal_intf.c +++ b/drivers/staging/rtl8723au/hal/hal_intf.c @@ -208,11 +208,6 @@ s32 rtw_hal_init23a_xmit_priv(struct rtw_adapter *padapter) return padapter->HalFunc.init_xmit_priv(padapter); return _FAIL; } -void rtw_hal_free_xmit_priv23a(struct rtw_adapter *padapter) -{ - if (padapter->HalFunc.free_xmit_priv != NULL) - padapter->HalFunc.free_xmit_priv(padapter); -} s32 rtw_hal_init23a_recv_priv(struct rtw_adapter *padapter) { diff --git a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c index 2af2e3ee1abc..ed8aeb447be7 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c +++ b/drivers/staging/rtl8723au/hal/rtl8723au_xmit.c @@ -31,10 +31,6 @@ s32 rtl8723au_init_xmit_priv(struct rtw_adapter *padapter) return _SUCCESS; } -void rtl8723au_free_xmit_priv(struct rtw_adapter *padapter) -{ -} - 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 edddc20f24ee..f34d5a40f349 100644 --- a/drivers/staging/rtl8723au/hal/usb_halinit.c +++ b/drivers/staging/rtl8723au/hal/usb_halinit.c @@ -1756,7 +1756,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter) pHalFunc->inirp_deinit = &rtl8723au_inirp_deinit; pHalFunc->init_xmit_priv = &rtl8723au_init_xmit_priv; - pHalFunc->free_xmit_priv = &rtl8723au_free_xmit_priv; pHalFunc->init_recv_priv = &rtl8723au_init_recv_priv; pHalFunc->free_recv_priv = &rtl8723au_free_recv_priv; diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index bc29bf2c45e9..2159f43ca286 100644 --- a/drivers/staging/rtl8723au/include/hal_intf.h +++ b/drivers/staging/rtl8723au/include/hal_intf.h @@ -71,7 +71,6 @@ struct hal_ops { u32 (*inirp_deinit)(struct rtw_adapter *padapter); s32 (*init_xmit_priv)(struct rtw_adapter *padapter); - void (*free_xmit_priv)(struct rtw_adapter *padapter); s32 (*init_recv_priv)(struct rtw_adapter *padapter); void (*free_recv_priv)(struct rtw_adapter *padapter); @@ -247,7 +246,6 @@ s32 rtw_hal_mgnt_xmit23a(struct rtw_adapter *padapter, struct xmit_frame *pmgntframe); s32 rtw_hal_init23a_xmit_priv(struct rtw_adapter *padapter); -void rtw_hal_free_xmit_priv23a(struct rtw_adapter *padapter); s32 rtw_hal_init23a_recv_priv(struct rtw_adapter *padapter); void rtw_hal_free_recv_priv23a(struct rtw_adapter *padapter); diff --git a/drivers/staging/rtl8723au/include/rtl8723a_xmit.h b/drivers/staging/rtl8723au/include/rtl8723a_xmit.h index 3b6fdc3a9b7b..80e379c6b6fe 100644 --- a/drivers/staging/rtl8723au/include/rtl8723a_xmit.h +++ b/drivers/staging/rtl8723au/include/rtl8723a_xmit.h @@ -220,7 +220,6 @@ s32 rtl8723au_hal_xmitframe_enqueue(struct rtw_adapter *padapter, struct xmit_fr 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); -void rtl8723au_free_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.20.1