From wfp5p@virginia.edu Mon Jul 27 14:11:15 2009 From: Bill Pemberton Date: Mon, 27 Jul 2009 16:47:39 -0400 Subject: Staging: hv: remove VMBUS_CHANNEL_PACKET_PAGE_BUFFER typedef To: greg@kroah.com Cc: hjanssen@microsoft.com Message-ID: <1248727665-23969-18-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 @@ -831,7 +831,7 @@ VmbusChannelSendPacketPageBuffer( { int ret=0; int i=0; - VMBUS_CHANNEL_PACKET_PAGE_BUFFER desc; + struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER desc; u32 descSize; u32 packetLen; u32 packetLenAligned; @@ -845,7 +845,7 @@ VmbusChannelSendPacketPageBuffer( DumpVmbusChannel(Channel); /* Adjust the size down since VMBUS_CHANNEL_PACKET_PAGE_BUFFER is the largest size we support */ - descSize = sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(PAGE_BUFFER)); + descSize = sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(PAGE_BUFFER)); packetLen = descSize + BufferLen; packetLenAligned = ALIGN_UP(packetLen, sizeof(u64)); --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h @@ -32,7 +32,7 @@ /* The format must be the same as VMDATA_GPA_DIRECT */ -typedef struct _VMBUS_CHANNEL_PACKET_PAGE_BUFFER { +struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER { u16 Type; u16 DataOffset8; u16 Length8; @@ -41,7 +41,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_PAG u32 Reserved; u32 RangeCount; PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT]; -} VMBUS_CHANNEL_PACKET_PAGE_BUFFER; +}; /* The format must be the same as VMDATA_GPA_DIRECT */ --- 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(VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); + sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); drv->name = gDriverName; memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID));