---

yaml --- r: 162282 b: refs/heads/master c: 7903506 h: refs/heads/master v: v3
git-mirror · Sep 15, 2009 · aef2d5d · aef2d5d
1 parent 6f5fd54
commit aef2d5d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f25c749bb830890a3e31236857523a57cf6ddc7c
+refs/heads/master: 7903506975905605bbb9077008ca83eabc0f6272
diff --git a/trunk/drivers/staging/hv/Channel.c b/trunk/drivers/staging/hv/Channel.c
@@ -169,7 +169,7 @@ void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel,
  */
 int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
 		     u32 RecvRingBufferSize, void *UserData, u32 UserDataLen,
-		     PFN_CHANNEL_CALLBACK pfnOnChannelCallback, void *Context)
+		     void (*OnChannelCallback)(void *context), void *Context)
 {
 	struct vmbus_channel_open_channel *openMsg;
 	struct vmbus_channel_msginfo *openInfo;
@@ -183,7 +183,7 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
 	ASSERT(!(SendRingBufferSize & (PAGE_SIZE - 1)));
 	ASSERT(!(RecvRingBufferSize & (PAGE_SIZE - 1)));
 
-	NewChannel->OnChannelCallback = pfnOnChannelCallback;
+	NewChannel->OnChannelCallback = OnChannelCallback;
 	NewChannel->ChannelCallbackContext = Context;
 
 	/* Allocate the ring buffer */

diff --git a/trunk/drivers/staging/hv/Channel.h b/trunk/drivers/staging/hv/Channel.h
@@ -57,7 +57,7 @@ extern int VmbusChannelOpen(struct vmbus_channel *channel,
 			    u32 RecvRingBufferSize,
 			    void *UserData,
 			    u32 UserDataLen,
-			    PFN_CHANNEL_CALLBACK pfnOnChannelCallback,
+			    void(*OnChannelCallback)(void *context),
 			    void *Context);
 
 extern void VmbusChannelClose(struct vmbus_channel *channel);

diff --git a/trunk/drivers/staging/hv/ChannelMgmt.h b/trunk/drivers/staging/hv/ChannelMgmt.h
@@ -218,8 +218,6 @@ struct vmbus_channel_version_response {
 	bool VersionSupported;
 } __attribute__((packed));
 
-typedef void (*PFN_CHANNEL_CALLBACK)(void *context);
-
 enum vmbus_channel_state {
 	CHANNEL_OFFER_STATE,
 	CHANNEL_OPENING_STATE,
@@ -256,7 +254,7 @@ struct vmbus_channel {
 	/* Channel callback are invoked in this workqueue context */
 	/* HANDLE dataWorkQueue; */
 
-	PFN_CHANNEL_CALLBACK OnChannelCallback;
+	void (*OnChannelCallback)(void *context);
 	void *ChannelCallbackContext;
 };