commit 3fcc523adca8e979eb710d54f467f8fc890a77da
author Bill Pemberton <wfp5p@virginia.edu> Mon Jul 27 16:47:40 2009 -0400
committer Greg Kroah-Hartman <gregkh@suse.de> Tue Sep 15 12:01:51 2009 -0700
tree 3ec5c3311a1f6e77d249f985811cfd2089fbdc75
parent 0cf4fa80781dcdb5bf6096fa221f3fc6c7073405

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>

drivers/staging/hv/Channel.c

diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index e2c833f..674f141 100644
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -912,7 +912,7 @@
 )
 {
 	int ret=0;
-	VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc;
+	struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc;
 	u32 descSize;
 	u32 packetLen;
 	u32 packetLenAligned;
@@ -930,7 +930,7 @@
 	ASSERT(PfnCount <= MAX_MULTIPAGE_BUFFER_COUNT);
 
 	/* Adjust the size down since VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER is the largest size we support */
-	descSize = sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(u64));
+	descSize = sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(u64));
 	packetLen = descSize + BufferLen;
 	packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
 

drivers/staging/hv/Channel.h

diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index 54b79f0..5dac07b 100644
--- a/drivers/staging/hv/Channel.h
+++ b/drivers/staging/hv/Channel.h
@@ -45,7 +45,7 @@
 
 
 /* The format must be the same as VMDATA_GPA_DIRECT */
-typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
+struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
     u16				Type;
     u16				DataOffset8;
     u16				Length8;
@@ -54,7 +54,7 @@
 	u32				Reserved;
 	u32				RangeCount;		/* Always 1 in this case */
 	MULTIPAGE_BUFFER	Range;
-} VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER;
+};
 
 #pragma pack(pop)
 

drivers/staging/hv/Vmbus.c

diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index cc5c61a..91b226f 100644
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -126,7 +126,7 @@
 	DPRINT_INFO(VMBUS, "+++++++ Vmbus using SINT %d +++++++", VMBUS_MESSAGE_SINT);
 
 	DPRINT_DBG(VMBUS, "sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER)=%ld, sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)=%ld",
-		sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER));
+		sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER));
 
 	drv->name = gDriverName;
 	memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID));