From wfp5p@virginia.edu Mon Jul 27 14:11:43 2009 From: Bill Pemberton Date: Mon, 27 Jul 2009 16:47:40 -0400 Subject: Staging: hv: remove VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER typedef To: greg@kroah.com Cc: hjanssen@microsoft.com Message-ID: <1248727665-23969-19-git-send-email-wfp5p@virginia.edu> Signed-off-by: Bill Pemberton Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/Channel.c | 4 ++-- drivers/staging/hv/Channel.h | 4 ++-- drivers/staging/hv/Vmbus.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c @@ -912,7 +912,7 @@ VmbusChannelSendPacketMultiPageBuffer( ) { 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 @@ VmbusChannelSendPacketMultiPageBuffer( 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)); --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h @@ -45,7 +45,7 @@ struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER /* 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 @@ typedef struct _VMBUS_CHANNEL_PACKET_MUL u32 Reserved; u32 RangeCount; /* Always 1 in this case */ MULTIPAGE_BUFFER Range; -} VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER; +}; #pragma pack(pop) --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c @@ -126,7 +126,7 @@ VmbusInitialize( 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));