[PATCH 10/13] staging/hv: use struct multipage_buffer

[joe at perches.com (Joe Perches)]

Signed-off-by: Joe Perches <joe at perches.com>
---
 drivers/staging/hv/Channel.c            |    2 +-
 drivers/staging/hv/Channel.h            |    4 ++--
 drivers/staging/hv/ChannelInterface.c   |    2 +-
 drivers/staging/hv/include/StorVscApi.h |    2 +-
 drivers/staging/hv/include/VmbusApi.h   |   10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 7ccd361..68bc0a3 100644
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -873,7 +873,7 @@ Description:
 --*/
 int
 VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel,
-				      MULTIPAGE_BUFFER * MultiPageBuffer,
+				      struct multipage_buffer *MultiPageBuffer,
 				      void *Buffer,
 				      u32 BufferLen, u64 RequestId)
 {
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index 4730d53..b6addd1 100644
--- a/drivers/staging/hv/Channel.h
+++ b/drivers/staging/hv/Channel.h
@@ -50,7 +50,7 @@ struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
 	u64 TransactionId;
 	u32 Reserved;
 	u32 RangeCount;		/* Always 1 in this case */
-	MULTIPAGE_BUFFER Range;
+	struct multipage_buffer Range;
 };
 
 #pragma pack(pop)
@@ -81,7 +81,7 @@ VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel,
 
 static int
 VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel,
-				      MULTIPAGE_BUFFER * MultiPageBuffer,
+				      struct multipage_buffer *MultiPageBuffer,
 				      void *Buffer,
 				      u32 BufferLen, u64 RequestId);
 
diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c
index 0a222cf..cce8085 100644
--- a/drivers/staging/hv/ChannelInterface.c
+++ b/drivers/staging/hv/ChannelInterface.c
@@ -66,7 +66,7 @@ IVmbusChannelSendPacketPageBuffer(struct hv_device *Device,
 
 static int
 IVmbusChannelSendPacketMultiPageBuffer(struct hv_device *Device,
-				       MULTIPAGE_BUFFER * MultiPageBuffer,
+				       struct multipage_buffer *MultiPageBuffer,
 				       void *Buffer,
 				       u32 BufferLen, u64 RequestId)
 {
diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h
index 8f9341f..f0cfeba 100644
--- a/drivers/staging/hv/include/StorVscApi.h
+++ b/drivers/staging/hv/include/StorVscApi.h
@@ -86,7 +86,7 @@ typedef struct _STORVSC_REQUEST {
 	/* This points to the memory after DataBuffer */
 	void *Extension;
 
-	MULTIPAGE_BUFFER DataBuffer;
+	struct multipage_buffer DataBuffer;
 } STORVSC_REQUEST;
 
 /* Represents the block vsc driver */
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index 03c6e18..6f836f8 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -46,16 +46,16 @@ struct page_buffer {
 };
 
 /* Multiple-page buffer */
-typedef struct _MULTIPAGE_BUFFER {
+struct multipage_buffer {
 	/* Length and Offset determines the # of pfns in the array */
 	u32 Length;
 	u32 Offset;
 	u64 PfnArray[MAX_MULTIPAGE_BUFFER_COUNT];
-} MULTIPAGE_BUFFER;
+};
 
 /* 0x18 includes the proprietary packet header */
-#define MAX_PAGE_BUFFER_PACKET			(0x18 + (sizeof(struct page_buffer) * MAX_PAGE_BUFFER_COUNT))
-#define MAX_MULTIPAGE_BUFFER_PACKET		(0x18 + sizeof(MULTIPAGE_BUFFER))
+#define MAX_PAGE_BUFFER_PACKET		(0x18 + (sizeof(struct page_buffer) * MAX_PAGE_BUFFER_COUNT))
+#define MAX_MULTIPAGE_BUFFER_PACKET	(0x18 + sizeof(struct multipage_buffer))
 
 #pragma pack(pop)
 
@@ -111,7 +111,7 @@ typedef int (*VMBUS_CHANNEL_SEND_PACKET_PAGEBUFFER) (struct hv_device * Device,
 
 typedef int (*VMBUS_CHANNEL_SEND_PACKET_MULTIPAGEBUFFER) (struct hv_device *
 							  Device,
-							  MULTIPAGE_BUFFER *
+							  struct multipage_buffer *
 							  MultiPageBuffer,
 							  void *Buffer,
 							  u32 BufferLen,
-- 
1.6.3.1.10.g659a0.dirty