diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-01 00:51:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:02 -0400 |
commit | c8212f04d677ff7571339da66e7dc523ef8e8ae1 (patch) | |
tree | 24ecd581804743586e14cadf31f036fae6a476e0 | |
parent | bd60c33e77a806e18309bb8ab787aa852e30fa56 (diff) |
Staging: hv: reorg ChannelMgmt a bit
This gets rid of the unneeded typedef and the forward declarations,
saving a bit of code file size.
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/hv/ChannelMgmt.c | 61 |
1 files changed, 24 insertions, 37 deletions
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index 1045ff95110..4a014ea7cf1 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c | |||
@@ -24,24 +24,11 @@ | |||
24 | #include "logging.h" | 24 | #include "logging.h" |
25 | #include "VmbusPrivate.h" | 25 | #include "VmbusPrivate.h" |
26 | 26 | ||
27 | typedef void (*PFN_CHANNEL_MESSAGE_HANDLER)(struct vmbus_channel_message_header *msg); | ||
28 | |||
29 | struct vmbus_channel_message_table_entry { | 27 | struct vmbus_channel_message_table_entry { |
30 | enum vmbus_channel_message_type messageType; | 28 | enum vmbus_channel_message_type messageType; |
31 | PFN_CHANNEL_MESSAGE_HANDLER messageHandler; | 29 | void (*messageHandler)(struct vmbus_channel_message_header *msg); |
32 | }; | 30 | }; |
33 | 31 | ||
34 | static void VmbusChannelOnOffer(struct vmbus_channel_message_header *); | ||
35 | static void VmbusChannelOnOpenResult(struct vmbus_channel_message_header *); | ||
36 | static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *); | ||
37 | static void VmbusChannelOnGpadlCreated(struct vmbus_channel_message_header *); | ||
38 | static void VmbusChannelOnGpadlTorndown(struct vmbus_channel_message_header *); | ||
39 | static void VmbusChannelOnOffersDelivered(struct vmbus_channel_message_header *); | ||
40 | static void VmbusChannelOnVersionResponse(struct vmbus_channel_message_header *); | ||
41 | static void VmbusChannelProcessOffer(void *context); | ||
42 | static void VmbusChannelProcessRescindOffer(void *context); | ||
43 | |||
44 | |||
45 | #define MAX_NUM_DEVICE_CLASSES_SUPPORTED 4 | 32 | #define MAX_NUM_DEVICE_CLASSES_SUPPORTED 4 |
46 | static const struct hv_guid | 33 | static const struct hv_guid |
47 | gSupportedDeviceClasses[MAX_NUM_DEVICE_CLASSES_SUPPORTED] = { | 34 | gSupportedDeviceClasses[MAX_NUM_DEVICE_CLASSES_SUPPORTED] = { |
@@ -82,28 +69,6 @@ static const struct hv_guid | |||
82 | }, | 69 | }, |
83 | }; | 70 | }; |
84 | 71 | ||
85 | /* Channel message dispatch table */ | ||
86 | static struct vmbus_channel_message_table_entry | ||
87 | gChannelMessageTable[ChannelMessageCount] = { | ||
88 | {ChannelMessageInvalid, NULL}, | ||
89 | {ChannelMessageOfferChannel, VmbusChannelOnOffer}, | ||
90 | {ChannelMessageRescindChannelOffer, VmbusChannelOnOfferRescind}, | ||
91 | {ChannelMessageRequestOffers, NULL}, | ||
92 | {ChannelMessageAllOffersDelivered, VmbusChannelOnOffersDelivered}, | ||
93 | {ChannelMessageOpenChannel, NULL}, | ||
94 | {ChannelMessageOpenChannelResult, VmbusChannelOnOpenResult}, | ||
95 | {ChannelMessageCloseChannel, NULL}, | ||
96 | {ChannelMessageGpadlHeader, NULL}, | ||
97 | {ChannelMessageGpadlBody, NULL}, | ||
98 | {ChannelMessageGpadlCreated, VmbusChannelOnGpadlCreated}, | ||
99 | {ChannelMessageGpadlTeardown, NULL}, | ||
100 | {ChannelMessageGpadlTorndown, VmbusChannelOnGpadlTorndown}, | ||
101 | {ChannelMessageRelIdReleased, NULL}, | ||
102 | {ChannelMessageInitiateContact, NULL}, | ||
103 | {ChannelMessageVersionResponse, VmbusChannelOnVersionResponse}, | ||
104 | {ChannelMessageUnload, NULL}, | ||
105 | }; | ||
106 | |||
107 | /** | 72 | /** |
108 | * AllocVmbusChannel - Allocate and initialize a vmbus channel object | 73 | * AllocVmbusChannel - Allocate and initialize a vmbus channel object |
109 | */ | 74 | */ |
@@ -574,6 +539,28 @@ static void VmbusChannelOnVersionResponse( | |||
574 | DPRINT_EXIT(VMBUS); | 539 | DPRINT_EXIT(VMBUS); |
575 | } | 540 | } |
576 | 541 | ||
542 | /* Channel message dispatch table */ | ||
543 | static struct vmbus_channel_message_table_entry | ||
544 | gChannelMessageTable[ChannelMessageCount] = { | ||
545 | {ChannelMessageInvalid, NULL}, | ||
546 | {ChannelMessageOfferChannel, VmbusChannelOnOffer}, | ||
547 | {ChannelMessageRescindChannelOffer, VmbusChannelOnOfferRescind}, | ||
548 | {ChannelMessageRequestOffers, NULL}, | ||
549 | {ChannelMessageAllOffersDelivered, VmbusChannelOnOffersDelivered}, | ||
550 | {ChannelMessageOpenChannel, NULL}, | ||
551 | {ChannelMessageOpenChannelResult, VmbusChannelOnOpenResult}, | ||
552 | {ChannelMessageCloseChannel, NULL}, | ||
553 | {ChannelMessageGpadlHeader, NULL}, | ||
554 | {ChannelMessageGpadlBody, NULL}, | ||
555 | {ChannelMessageGpadlCreated, VmbusChannelOnGpadlCreated}, | ||
556 | {ChannelMessageGpadlTeardown, NULL}, | ||
557 | {ChannelMessageGpadlTorndown, VmbusChannelOnGpadlTorndown}, | ||
558 | {ChannelMessageRelIdReleased, NULL}, | ||
559 | {ChannelMessageInitiateContact, NULL}, | ||
560 | {ChannelMessageVersionResponse, VmbusChannelOnVersionResponse}, | ||
561 | {ChannelMessageUnload, NULL}, | ||
562 | }; | ||
563 | |||
577 | /** | 564 | /** |
578 | * VmbusOnChannelMessage - Handler for channel protocol messages. | 565 | * VmbusOnChannelMessage - Handler for channel protocol messages. |
579 | * | 566 | * |