Commit 79035069 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f25c749b
...@@ -169,7 +169,7 @@ void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel, ...@@ -169,7 +169,7 @@ void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel,
*/ */
int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize, int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
u32 RecvRingBufferSize, void *UserData, u32 UserDataLen, 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_open_channel *openMsg;
struct vmbus_channel_msginfo *openInfo; struct vmbus_channel_msginfo *openInfo;
...@@ -183,7 +183,7 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize, ...@@ -183,7 +183,7 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
ASSERT(!(SendRingBufferSize & (PAGE_SIZE - 1))); ASSERT(!(SendRingBufferSize & (PAGE_SIZE - 1)));
ASSERT(!(RecvRingBufferSize & (PAGE_SIZE - 1))); ASSERT(!(RecvRingBufferSize & (PAGE_SIZE - 1)));
NewChannel->OnChannelCallback = pfnOnChannelCallback; NewChannel->OnChannelCallback = OnChannelCallback;
NewChannel->ChannelCallbackContext = Context; NewChannel->ChannelCallbackContext = Context;
/* Allocate the ring buffer */ /* Allocate the ring buffer */
......
...@@ -57,7 +57,7 @@ extern int VmbusChannelOpen(struct vmbus_channel *channel, ...@@ -57,7 +57,7 @@ extern int VmbusChannelOpen(struct vmbus_channel *channel,
u32 RecvRingBufferSize, u32 RecvRingBufferSize,
void *UserData, void *UserData,
u32 UserDataLen, u32 UserDataLen,
PFN_CHANNEL_CALLBACK pfnOnChannelCallback, void(*OnChannelCallback)(void *context),
void *Context); void *Context);
extern void VmbusChannelClose(struct vmbus_channel *channel); extern void VmbusChannelClose(struct vmbus_channel *channel);
......
...@@ -218,8 +218,6 @@ struct vmbus_channel_version_response { ...@@ -218,8 +218,6 @@ struct vmbus_channel_version_response {
bool VersionSupported; bool VersionSupported;
} __attribute__((packed)); } __attribute__((packed));
typedef void (*PFN_CHANNEL_CALLBACK)(void *context);
enum vmbus_channel_state { enum vmbus_channel_state {
CHANNEL_OFFER_STATE, CHANNEL_OFFER_STATE,
CHANNEL_OPENING_STATE, CHANNEL_OPENING_STATE,
...@@ -256,7 +254,7 @@ struct vmbus_channel { ...@@ -256,7 +254,7 @@ struct vmbus_channel {
/* Channel callback are invoked in this workqueue context */ /* Channel callback are invoked in this workqueue context */
/* HANDLE dataWorkQueue; */ /* HANDLE dataWorkQueue; */
PFN_CHANNEL_CALLBACK OnChannelCallback; void (*OnChannelCallback)(void *context);
void *ChannelCallbackContext; void *ChannelCallbackContext;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment