Staging: hv: Transform typedef HANDLE into void *

PATCH In review Nicolas Palix 2 participants 2 messages Jul 27, 2009

Subsystems (2)

Staging Kernel janitors

lore

Share & tools

lore

Nicolas Palix

author

2009-07-27 19:11 UTC #0 lore raw

PATCH 1/1 Staging: hv: Transform typedef HANDLE into void *

Remove typedef HANDLE which aliases a void pointer and use void * anywhere HANDLE was used.

Here is the semantic patch to perform this transformation:
(http://www.emn.fr/x-info/coccinelle/)

//<smpl>
@rem_handle@
@@
-typedef void *HANDLE;

@fix_handle@
typedef HANDLE;
@@
-HANDLE
+void *

@fix_sizeof_handle@
@@
-sizeof(HANDLE)
+sizeof(void *)
//</smpl>

Signed-off-by Nicolas Palix <[email protected]>

---
 drivers/staging/hv/ChannelMgmt.h  |    8 ++++----
 drivers/staging/hv/Hv.c           |    4 ++--
 drivers/staging/hv/Hv.h           |    4 ++--
 drivers/staging/hv/NetVsc.h       |    2 +-
 drivers/staging/hv/RndisFilter.c  |    2 +-
 drivers/staging/hv/StorVsc.c      |    4 ++--
 drivers/staging/hv/VmbusPrivate.h |    4 ++--
 drivers/staging/hv/include/osd.h  |   25 ++++++++++++-------------
 drivers/staging/hv/osd.c          |   24 ++++++++++++------------
 9 files changed, 38 insertions(+), 39 deletions(-)

drivers/staging/hv/ChannelMgmt.h +4 -4

index b7afeca..9567e66 100644
@@ -47,7 +47,7 @@ typedef struct _VMBUS_CHANNEL {
 
 	DEVICE_OBJECT*				DeviceObject;
 
-	HANDLE						PollTimer; // SA-111 workaround
+	void 					*PollTimer; // SA-111 workaround
 
 	VMBUS_CHANNEL_STATE			State;

@@ -64,10 +64,10 @@ typedef struct _VMBUS_CHANNEL {
 	RING_BUFFER_INFO			Outbound;	// send to parent
 	RING_BUFFER_INFO			Inbound;	// receive from parent
 	spinlock_t inbound_lock;
-	HANDLE						ControlWQ;
+	void 					*ControlWQ;
 
 	// Channel callback are invoked in this workqueue context
-	//HANDLE						dataWorkQueue;
+	//void 					*dataWorkQueue;
 
 	PFN_CHANNEL_CALLBACK		OnChannelCallback;
 	void *						ChannelCallbackContext;

@@ -113,7 +113,7 @@ typedef struct _VMBUS_CHANNEL_MSGINFO {
 	LIST_ENTRY		SubMsgList;
 
 	// Synchronize the request/response if needed
-	HANDLE			WaitEvent;
+	void 			*WaitEvent;
 
 	VMBUS_CHANNEL_MESSAGE_RESPONSE Response;

drivers/staging/hv/Hv.c +2 -2

index 3a833ad..f1ceaef 100644
@@ -237,8 +237,8 @@ HvInit (
 
 	DPRINT_ENTER(VMBUS);
 
-	memset(gHvContext.synICEventPage, 0, sizeof(HANDLE)*MAX_NUM_CPUS);
-	memset(gHvContext.synICMessagePage, 0, sizeof(HANDLE)*MAX_NUM_CPUS);
+	memset(gHvContext.synICEventPage,   0, sizeof(void *) * MAX_NUM_CPUS);
+	memset(gHvContext.synICMessagePage, 0, sizeof(void *) * MAX_NUM_CPUS);
 
 	if (!HvQueryHypervisorPresence())
 	{

drivers/staging/hv/Hv.h +2 -2

index dbe9bb8..de10eea 100644
@@ -119,8 +119,8 @@ typedef struct {
 	HV_INPUT_SIGNAL_EVENT_BUFFER *SignalEventBuffer;
 	HV_INPUT_SIGNAL_EVENT *SignalEventParam; // 8-bytes aligned of the buffer above
 
-	HANDLE	synICMessagePage[MAX_NUM_CPUS];
-	HANDLE	synICEventPage[MAX_NUM_CPUS];
+	void   *synICMessagePage[MAX_NUM_CPUS];
+	void   *synICEventPage[MAX_NUM_CPUS];
 } HV_CONTEXT;
 
 extern HV_CONTEXT gHvContext;

drivers/staging/hv/NetVsc.h +1 -1

index d6b0d67..84e163b 100644
@@ -78,7 +78,7 @@ typedef struct _NETVSC_DEVICE {
 	PNVSP_1_RECEIVE_BUFFER_SECTION	ReceiveSections;
 
 	// Used for NetVSP initialization protocol
-	HANDLE							ChannelInitEvent;
+	void 							*ChannelInitEvent;
 	NVSP_MESSAGE					ChannelInitPacket;
 
 	NVSP_MESSAGE					RevokePacket;

drivers/staging/hv/RndisFilter.c +1 -1

index 714f23e..7d5923b 100644
@@ -61,7 +61,7 @@ typedef struct _RNDIS_DEVICE {
 
 typedef struct _RNDIS_REQUEST {
 	LIST_ENTRY					ListEntry;
-	HANDLE						WaitEvent;
+	void 						*WaitEvent;
 
 	// FIXME: We assumed a fixed size response here. If we do ever need to handle a bigger response,
 	// we can either define a max response message or add a response buffer variable above this field

drivers/staging/hv/StorVsc.c +2 -2

index 439c447..238f8e7 100644
@@ -47,7 +47,7 @@ typedef struct _STORVSC_REQUEST_EXTENSION {
 	DEVICE_OBJECT					*Device;
 
 	// Synchronize the request/response if needed
-	HANDLE							WaitEvent;
+	void 							*WaitEvent;
 
 	VSTOR_PACKET					VStorPacket;
 } STORVSC_REQUEST_EXTENSION;

@@ -68,7 +68,7 @@ typedef struct _STORVSC_DEVICE{
     unsigned char						TargetId;
 
 	//LIST_ENTRY					OutstandingRequestList;
-	//HANDLE						OutstandingRequestLock;
+	//void 						*OutstandingRequestLock;
 
 	// Used for vsc/vsp channel reset process
 	STORVSC_REQUEST_EXTENSION	InitRequest;

drivers/staging/hv/VmbusPrivate.h +2 -2

index 686d05f..2f15560 100644
@@ -86,7 +86,7 @@ typedef struct _VMBUS_CONNECTION {
 	LIST_ENTRY							ChannelList;
 	spinlock_t channel_lock;
 
-	HANDLE								WorkQueue;
+	void 								*WorkQueue;
 } VMBUS_CONNECTION;

@@ -95,7 +95,7 @@ typedef struct _VMBUS_MSGINFO {
 	LIST_ENTRY			MsgListEntry;
 
 	// Synchronize the request/response if needed
-	HANDLE				WaitEvent;
+	void 				*WaitEvent;
 
 	// The message itself
 	unsigned char		Msg[0];

drivers/staging/hv/include/osd.h +12 ~~-13~~

index 3878a2f..2c1d4bc 100644
@@ -46,7 +46,6 @@ typedef struct _DLIST_ENTRY {
 // Other types
 //
 //typedef unsigned char		GUID[16];
-typedef void*				HANDLE;
 
 typedef struct {
 	unsigned char	Data[16];

@@ -117,18 +116,18 @@ extern void PageFree(void* page, unsigned int count);
 extern void* MemMapIO(unsigned long phys, unsigned long size);
 extern void MemUnmapIO(void* virt);
 
-extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context);
-extern void TimerClose(HANDLE hTimer);
-extern int TimerStop(HANDLE hTimer);
-extern void TimerStart(HANDLE hTimer, u32 expirationInUs);
+extern void *TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void *context);
+extern void  TimerClose(void *hTimer);
+extern int   TimerStop(void *hTimer);
+extern void  TimerStart(void *hTimer, u32 expirationInUs);
 
-extern HANDLE WaitEventCreate(void);
-extern void WaitEventClose(HANDLE hWait);
-extern void WaitEventSet(HANDLE hWait);
-extern int	WaitEventWait(HANDLE hWait);
+extern void *WaitEventCreate(void);
+extern void  WaitEventClose(void *hWait);
+extern void  WaitEventSet(void *hWait);
+extern int   WaitEventWait(void *hWait);
 
 // If >0, hWait got signaled. If =0, timeout. If < 0, error
-extern int	WaitEventWaitEx(HANDLE hWait, u32 TimeoutInMs);
+extern int	WaitEventWaitEx(void *hWait, u32 TimeoutInMs);
 
 
 #define GetVirtualAddress Physical2LogicalAddr

@@ -143,9 +142,9 @@ void* PageMapVirtualAddress(unsigned long Pfn);
 void PageUnmapVirtualAddress(void* VirtAddr);
 
 
-extern HANDLE WorkQueueCreate(char* name);
-extern void WorkQueueClose(HANDLE hWorkQueue);
-extern int WorkQueueQueueWorkItem(HANDLE hWorkQueue, PFN_WORKITEM_CALLBACK workItem, void* context);
+extern void *WorkQueueCreate(char* name);
+extern void  WorkQueueClose(void *hWorkQueue);
+extern int   WorkQueueQueueWorkItem(void *hWorkQueue, PFN_WORKITEM_CALLBACK workItem, void *context);
 
 extern void QueueWorkItem(PFN_WORKITEM_CALLBACK workItem, void* context);

drivers/staging/hv/osd.c +12 ~~-12~~

index 3cc2bb3..f26db86 100644
@@ -191,7 +191,7 @@ void TimerCallback(unsigned long data)
 	t->callback(t->context);
 }
 
-HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context)
+void *TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void *context)
 {
 	TIMER* t = kmalloc(sizeof(TIMER), GFP_KERNEL);
 	if (!t)

@@ -209,7 +209,7 @@ HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context)
 	return t;
 }
 
-void TimerStart(HANDLE hTimer, u32 expirationInUs)
+void TimerStart(void *hTimer, u32 expirationInUs)
 {
 	TIMER* t  = (TIMER* )hTimer;

@@ -217,14 +217,14 @@ void TimerStart(HANDLE hTimer, u32 expirationInUs)
 	add_timer(&t->timer);
 }
 
-int TimerStop(HANDLE hTimer)
+int TimerStop(void *hTimer)
 {
 	TIMER* t  = (TIMER* )hTimer;
 
 	return del_timer(&t->timer);
 }
 
-void TimerClose(HANDLE hTimer)
+void TimerClose(void *hTimer)
 {
 	TIMER* t  = (TIMER* )hTimer;

@@ -232,7 +232,7 @@ void TimerClose(HANDLE hTimer)
 	kfree(t);
 }
 
-HANDLE WaitEventCreate(void)
+void *WaitEventCreate(void)
 {
 	WAITEVENT* wait = kmalloc(sizeof(WAITEVENT), GFP_KERNEL);
 	if (!wait)

@@ -245,20 +245,20 @@ HANDLE WaitEventCreate(void)
 	return wait;
 }
 
-void WaitEventClose(HANDLE hWait)
+void WaitEventClose(void *hWait)
 {
 	WAITEVENT* waitEvent = (WAITEVENT* )hWait;
 	kfree(waitEvent);
 }
 
-void WaitEventSet(HANDLE hWait)
+void WaitEventSet(void *hWait)
 {
 	WAITEVENT* waitEvent = (WAITEVENT* )hWait;
 	waitEvent->condition = 1;
 	wake_up_interruptible(&waitEvent->event);
 }
 
-int WaitEventWait(HANDLE hWait)
+int WaitEventWait(void *hWait)
 {
 	int ret=0;
 	WAITEVENT* waitEvent = (WAITEVENT* )hWait;

@@ -269,7 +269,7 @@ int WaitEventWait(HANDLE hWait)
 	return ret;
 }
 
-int WaitEventWaitEx(HANDLE hWait, u32 TimeoutInMs)
+int WaitEventWaitEx(void *hWait, u32 TimeoutInMs)
 {
 	int ret=0;
 	WAITEVENT* waitEvent = (WAITEVENT* )hWait;

@@ -311,7 +311,7 @@ void WorkItemCallback(struct work_struct *work)
 	kfree(w);
 }
 
-HANDLE WorkQueueCreate(char* name)
+void *WorkQueueCreate(char *name)
 {
 	WORKQUEUE *wq = kmalloc(sizeof(WORKQUEUE), GFP_KERNEL);
 	if (!wq)

@@ -323,7 +323,7 @@ HANDLE WorkQueueCreate(char* name)
 	return wq;
 }
 
-void WorkQueueClose(HANDLE hWorkQueue)
+void WorkQueueClose(void *hWorkQueue)
 {
 	WORKQUEUE *wq = (WORKQUEUE *)hWorkQueue;

@@ -332,7 +332,7 @@ void WorkQueueClose(HANDLE hWorkQueue)
 	return;
 }
 
-int WorkQueueQueueWorkItem(HANDLE hWorkQueue, PFN_WORKITEM_CALLBACK workItem, void* context)
+int WorkQueueQueueWorkItem(void *hWorkQueue, PFN_WORKITEM_CALLBACK workItem, void *context)
 {
 	WORKQUEUE *wq = (WORKQUEUE *)hWorkQueue;

Signature · 5 lines

1.6.0.4


-- 
Nicolas Palix

Greg KH

2009-07-27 19:20 UTC #1 lore raw

Quoted 3 lines · Nicolas Palix

Remove typedef HANDLE which aliases a void pointer and use void * anywhere HANDLE was used.

No, I would like to change this to be the "real" pointer that the HANDLE was used for, instead of just a void pointer. These need to point to real structures. I did this already for the locks, and can be done for pretty much everything else as well.

drivers/staging/hv/osd.c void WorkQueueClose(HANDLE hWorkQueue) · line 337

Quoted 4 lines

drivers/staging/hv/osd.c +1 -1

-int WorkQueueQueueWorkItem(HANDLE hWorkQueue, PFN_WORKITEM_CALLBACK workItem, void* context)
+int WorkQueueQueueWorkItem(void *hWorkQueue, PFN_WORKITEM_CALLBACK workItem, void *context)
 {
 	WORKQUEUE *wq = (WORKQUEUE *)hWorkQueue;

Here's an example. This should really be a pointer to a "work queue" and not a void pointer at all. Changes like that would be gladly accepted.

thanks,

greg k-h