diff mbox series

[16/23] staging: r8188eu: use list_head for xmitframe list

Message ID	20230123205342.229589-17-martin@kaiser.cx
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Martin Kaiser <martin@kaiser.cx> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Larry Finger <Larry.Finger@lwfinger.net>, Phillip Potter <phil@philpotter.co.uk>, Michael Straube <straube.linux@gmail.com>, Pavel Skripkin <paskripkin@gmail.com>, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx> Subject: [PATCH 16/23] staging: r8188eu: use list_head for xmitframe list Date: Mon, 23 Jan 2023 21:53:35 +0100 Message-Id: <20230123205342.229589-17-martin@kaiser.cx> In-Reply-To: <20230123205342.229589-1-martin@kaiser.cx> References: <20230123205342.229589-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	staging: r8188eu: some more xmit cleanups \| [00/23] staging: r8188eu: some more xmit cleanups [01/23] staging: r8188eu: we use a constant number of hw_xmit entries [02/23] staging: r8188eu: pass struct adapter to usb_write [03/23] staging: r8188eu: remove struct intf_hdl [04/23] staging: r8188eu: remove struct intf_priv [05/23] staging: r8188eu: simplify the sta loop in rtw_dequeue_xframe [06/23] staging: r8188eu: simplify the code to initialise inx [07/23] staging: r8188eu: remove an obsolete comment [08/23] staging: r8188eu: remove unused function parameter [09/23] staging: r8188eu: remove dead assignment [10/23] staging: r8188eu: use list_empty [11/23] staging: r8188eu: simplify dequeue_one_xmitframe [12/23] staging: r8188eu: remove redundant parameter [13/23] staging: r8188eu: make rtw_chk_hi_queue_cmd a void function [14/23] staging: r8188eu: decrement qcnt in rtw_dequeue_xframe [15/23] staging: r8188eu: simplify dequeue_one_xmitframe [16/23] staging: r8188eu: use list_head for xmitframe list [17/23] staging: r8188eu: merge dequeue_one_xmitframe into its caller [18/23] staging: r8188eu: use lists for hwxmits [19/23] staging: r8188eu: fix rtw_xmitframe_enqueue error handling [20/23] staging: r8188eu: remove rtw_xmitframe_enqueue [21/23] staging: r8188eu: struct agg_pkt_info is unused [22/23] staging: r8188eu: apsd_setting is unused [23/23] staging: r8188eu: merge rtw_free_hwxmits into its only caller

Commit Message

Martin Kaiser Jan. 23, 2023, 8:53 p.m. UTC

  The r8188eu driver defines a struct __queue that contains a list_head and
a spinlock.

struct tx_servq describes a station for which we have pending tx packets.
This struct contains a __queue for the pending packets (a __queue of
struct xmit_frame entries). In this particular case, the queue's spinlock
is not used, we need only the list_head.

rtw_dequeue_xframe uses a local variable for such an xmit_frame queue.
This patch replaces this variable with a list_head.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/core/rtw_xmit.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 79a1999ca809..6060a1832431 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -1355,15 +1355,14 @@  s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitfram
 	return _SUCCESS;
 }
 
-static struct xmit_frame *dequeue_one_xmitframe(struct __queue *pframe_queue)
+static struct xmit_frame *dequeue_one_xmitframe(struct list_head *xframe_list)
 {
-	struct list_head *xmitframe_phead = get_list_head(pframe_queue);
 	struct xmit_frame *pxmitframe;
 
-	if (list_empty(xmitframe_phead))
+	if (list_empty(xframe_list))
 		return NULL;
 
-	pxmitframe = container_of(xmitframe_phead->next, struct xmit_frame, list);
+	pxmitframe = container_of(xframe_list->next, struct xmit_frame, list);
 	list_del_init(&pxmitframe->list);
 	return pxmitframe;
 }
@@ -1373,7 +1372,7 @@  struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
 	struct list_head *sta_phead;
 	struct hw_xmit *phwxmit;
 	struct tx_servq *ptxservq, *tmp_txservq;
-	struct __queue *pframe_queue = NULL;
+	struct list_head *xframe_list;
 	struct xmit_frame *pxmitframe = NULL;
 	struct adapter *padapter = pxmitpriv->adapter;
 	struct registry_priv	*pregpriv = &padapter->registrypriv;
@@ -1393,16 +1392,15 @@  struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
 
 		list_for_each_entry_safe(ptxservq, tmp_txservq, sta_phead, tx_pending) {
 
-			pframe_queue = &ptxservq->sta_pending;
-
-			pxmitframe = dequeue_one_xmitframe(pframe_queue);
+			xframe_list = get_list_head(&ptxservq->sta_pending);
+			pxmitframe = dequeue_one_xmitframe(xframe_list);
 
 			if (pxmitframe) {
 				phwxmit->accnt--;
 				ptxservq->qcnt--;
 
 				/* Remove sta node when there are no pending packets. */
-				if (list_empty(&pframe_queue->queue))
+				if (list_empty(xframe_list))
 					list_del_init(&ptxservq->tx_pending);
 				goto exit;
 			}