From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 2 Sep 2009 18:44:19 +0000 (-0700)
Subject: Staging: hv: remove PFN_CHANNEL_CALLBACK
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7903506975905605bbb9077008ca83eabc0f6272;p=openwrt%2Fstaging%2Fblogic.git

Staging: hv: remove PFN_CHANNEL_CALLBACK

Come on people, it doesn't get simpler than this, why
have a typedef for something so tiny...

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 442e6a3c6f5a..ed94e3656e71 100644
--- a/drivers/staging/hv/Channel.c
+++ b/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/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index 2fa28259ed0e..6b283edcae68 100644
--- a/drivers/staging/hv/Channel.h
+++ b/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/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h
index 733ef8d45a35..0730182fe202 100644
--- a/drivers/staging/hv/ChannelMgmt.h
+++ b/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;
 };