diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-07-27 16:47:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:51 -0400 |
commit | 3fcc523adca8e979eb710d54f467f8fc890a77da (patch) | |
tree | 3ec5c3311a1f6e77d249f985811cfd2089fbdc75 /drivers | |
parent | 0cf4fa80781dcdb5bf6096fa221f3fc6c7073405 (diff) |
Staging: hv: remove VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/hv/Channel.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/Channel.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/Vmbus.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index e2c833fb923..674f141a648 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c | |||
@@ -912,7 +912,7 @@ VmbusChannelSendPacketMultiPageBuffer( | |||
912 | ) | 912 | ) |
913 | { | 913 | { |
914 | int ret=0; | 914 | int ret=0; |
915 | VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc; | 915 | struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc; |
916 | u32 descSize; | 916 | u32 descSize; |
917 | u32 packetLen; | 917 | u32 packetLen; |
918 | u32 packetLenAligned; | 918 | u32 packetLenAligned; |
@@ -930,7 +930,7 @@ VmbusChannelSendPacketMultiPageBuffer( | |||
930 | ASSERT(PfnCount <= MAX_MULTIPAGE_BUFFER_COUNT); | 930 | ASSERT(PfnCount <= MAX_MULTIPAGE_BUFFER_COUNT); |
931 | 931 | ||
932 | /* Adjust the size down since VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER is the largest size we support */ | 932 | /* Adjust the size down since VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER is the largest size we support */ |
933 | descSize = sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(u64)); | 933 | descSize = sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(u64)); |
934 | packetLen = descSize + BufferLen; | 934 | packetLen = descSize + BufferLen; |
935 | packetLenAligned = ALIGN_UP(packetLen, sizeof(u64)); | 935 | packetLenAligned = ALIGN_UP(packetLen, sizeof(u64)); |
936 | 936 | ||
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h index 54b79f083fb..5dac07b7b18 100644 --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h | |||
@@ -45,7 +45,7 @@ struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER { | |||
45 | 45 | ||
46 | 46 | ||
47 | /* The format must be the same as VMDATA_GPA_DIRECT */ | 47 | /* The format must be the same as VMDATA_GPA_DIRECT */ |
48 | typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER { | 48 | struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER { |
49 | u16 Type; | 49 | u16 Type; |
50 | u16 DataOffset8; | 50 | u16 DataOffset8; |
51 | u16 Length8; | 51 | u16 Length8; |
@@ -54,7 +54,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER { | |||
54 | u32 Reserved; | 54 | u32 Reserved; |
55 | u32 RangeCount; /* Always 1 in this case */ | 55 | u32 RangeCount; /* Always 1 in this case */ |
56 | MULTIPAGE_BUFFER Range; | 56 | MULTIPAGE_BUFFER Range; |
57 | } VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER; | 57 | }; |
58 | 58 | ||
59 | #pragma pack(pop) | 59 | #pragma pack(pop) |
60 | 60 | ||
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index cc5c61a9484..91b226f7341 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c | |||
@@ -126,7 +126,7 @@ VmbusInitialize( | |||
126 | DPRINT_INFO(VMBUS, "+++++++ Vmbus using SINT %d +++++++", VMBUS_MESSAGE_SINT); | 126 | DPRINT_INFO(VMBUS, "+++++++ Vmbus using SINT %d +++++++", VMBUS_MESSAGE_SINT); |
127 | 127 | ||
128 | DPRINT_DBG(VMBUS, "sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER)=%ld, sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)=%ld", | 128 | DPRINT_DBG(VMBUS, "sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER)=%ld, sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)=%ld", |
129 | sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); | 129 | sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); |
130 | 130 | ||
131 | drv->name = gDriverName; | 131 | drv->name = gDriverName; |
132 | memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID)); | 132 | memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID)); |