[PATCH 3/4] staging/hv: remove use of internal list routines in RndisFilter

[Bill Pemberton <wfp5p@xxxxxxxxxxxx>]

The hv driver has it's own linked list routines.  This removes them
from RndisFilter.c

Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx>
---
 drivers/staging/hv/RndisFilter.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index 682448c..f51bbce 100644
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -53,14 +53,14 @@ struct rndis_device {
 	atomic_t NewRequestId;
 
 	spinlock_t request_lock;
-	LIST_ENTRY				RequestList;
+	struct list_head RequestList;
 
 	unsigned char					HwMacAddr[HW_MACADDR_LEN];
 };
 
 
 struct rndis_request {
-	LIST_ENTRY					ListEntry;
+	struct list_head ListEntry;
 	struct osd_waitevent *WaitEvent;
 
 	/* FIXME: We assumed a fixed size response here. If we do ever need to handle a bigger response, */
@@ -206,7 +206,7 @@ static inline struct rndis_device *GetRndisDevice(void)
 
 	spin_lock_init(&device->request_lock);
 
-	INITIALIZE_LIST_HEAD(&device->RequestList);
+	INIT_LIST_HEAD(&device->RequestList);
 
 	device->State = RNDIS_DEV_UNINITIALIZED;
 
@@ -249,7 +249,7 @@ static inline struct rndis_request *GetRndisRequest(struct rndis_device *Device,
 
 	/* Add to the request list */
 	spin_lock_irqsave(&Device->request_lock, flags);
-	INSERT_TAIL_LIST(&Device->RequestList, &request->ListEntry);
+	list_add_tail(&request->ListEntry, &Device->RequestList);
 	spin_unlock_irqrestore(&Device->request_lock, flags);
 
 	return request;
@@ -260,7 +260,7 @@ static inline void PutRndisRequest(struct rndis_device *Device, struct rndis_req
 	unsigned long flags;
 
 	spin_lock_irqsave(&Device->request_lock, flags);
-	REMOVE_ENTRY_LIST(&Request->ListEntry);
+	list_del(&Request->ListEntry);
 	spin_unlock_irqrestore(&Device->request_lock, flags);
 
 	kfree(Request->WaitEvent);
@@ -363,8 +363,7 @@ RndisFilterSendRequest(
 static void RndisFilterReceiveResponse(struct rndis_device *Device,
 				       struct rndis_message *Response)
 {
-	LIST_ENTRY *anchor;
-	LIST_ENTRY *curr;
+	struct list_head *curr;
 	struct rndis_request *request = NULL;
 	bool found = false;
 	unsigned long flags;
@@ -372,9 +371,8 @@ static void RndisFilterReceiveResponse(struct rndis_device *Device,
 	DPRINT_ENTER(NETVSC);
 
 	spin_lock_irqsave(&Device->request_lock, flags);
-	ITERATE_LIST_ENTRIES(anchor, curr, &Device->RequestList)
-	{
-		request = CONTAINING_RECORD(curr, struct rndis_request, ListEntry);
+	list_for_each(curr, &Device->RequestList) {
+		request = list_entry(curr, struct rndis_request, ListEntry);
 
 		/* All request/response message contains RequestId as the 1st field */
 		if (request->RequestMessage.Message.InitializeRequest.RequestId == Response->Message.InitializeComplete.RequestId)
-- 
1.6.2.5

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel