diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-07-27 16:47:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:51 -0400 |
commit | 0cf4fa80781dcdb5bf6096fa221f3fc6c7073405 (patch) | |
tree | 0daf42a7f1f707c7d9b8e2a90805a3e3d0196b1e /drivers | |
parent | b75f9c8cd2b0ed58f07142af84ddc68be45068c3 (diff) |
Staging: hv: remove VMBUS_CHANNEL_PACKET_PAGE_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 bd82154e69f..e2c833fb923 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c | |||
@@ -831,7 +831,7 @@ VmbusChannelSendPacketPageBuffer( | |||
831 | { | 831 | { |
832 | int ret=0; | 832 | int ret=0; |
833 | int i=0; | 833 | int i=0; |
834 | VMBUS_CHANNEL_PACKET_PAGE_BUFFER desc; | 834 | struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER desc; |
835 | u32 descSize; | 835 | u32 descSize; |
836 | u32 packetLen; | 836 | u32 packetLen; |
837 | u32 packetLenAligned; | 837 | u32 packetLenAligned; |
@@ -845,7 +845,7 @@ VmbusChannelSendPacketPageBuffer( | |||
845 | DumpVmbusChannel(Channel); | 845 | DumpVmbusChannel(Channel); |
846 | 846 | ||
847 | /* Adjust the size down since VMBUS_CHANNEL_PACKET_PAGE_BUFFER is the largest size we support */ | 847 | /* Adjust the size down since VMBUS_CHANNEL_PACKET_PAGE_BUFFER is the largest size we support */ |
848 | descSize = sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(PAGE_BUFFER)); | 848 | descSize = sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(PAGE_BUFFER)); |
849 | packetLen = descSize + BufferLen; | 849 | packetLen = descSize + BufferLen; |
850 | packetLenAligned = ALIGN_UP(packetLen, sizeof(u64)); | 850 | packetLenAligned = ALIGN_UP(packetLen, sizeof(u64)); |
851 | 851 | ||
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h index be65d64e459..54b79f083fb 100644 --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | 33 | ||
34 | /* The format must be the same as VMDATA_GPA_DIRECT */ | 34 | /* The format must be the same as VMDATA_GPA_DIRECT */ |
35 | typedef struct _VMBUS_CHANNEL_PACKET_PAGE_BUFFER { | 35 | struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER { |
36 | u16 Type; | 36 | u16 Type; |
37 | u16 DataOffset8; | 37 | u16 DataOffset8; |
38 | u16 Length8; | 38 | u16 Length8; |
@@ -41,7 +41,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_PAGE_BUFFER { | |||
41 | u32 Reserved; | 41 | u32 Reserved; |
42 | u32 RangeCount; | 42 | u32 RangeCount; |
43 | PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT]; | 43 | PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT]; |
44 | } VMBUS_CHANNEL_PACKET_PAGE_BUFFER; | 44 | }; |
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 */ |
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 81b86c27066..cc5c61a9484 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(VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); | 129 | sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(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)); |