From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 20 Aug 2009 19:15:54 +0000 (-0700)
Subject: Staging: hv: typedef removal from VmbusChannelInterface.h
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1732a1e8a48459cfe4b6244284507a321e9b7725;p=deliverable%2Flinux.git

Staging: hv: typedef removal from VmbusChannelInterface.h

It's all clean now.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/include/ChannelMessages.h b/drivers/staging/hv/include/ChannelMessages.h
index 097e1c11e915..1e41948934ce 100644
--- a/drivers/staging/hv/include/ChannelMessages.h
+++ b/drivers/staging/hv/include/ChannelMessages.h
@@ -89,7 +89,7 @@ typedef struct _VMBUS_CHANNEL_VERSION_SUPPORTED
 typedef struct _VMBUS_CHANNEL_OFFER_CHANNEL
 {
     VMBUS_CHANNEL_MESSAGE_HEADER Header;
-    VMBUS_CHANNEL_OFFER Offer;
+    struct vmbus_channel_offer Offer;
     u32  ChildRelId;
     u8   MonitorId;
     bool MonitorAllocated;
@@ -131,12 +131,12 @@ typedef struct _VMBUS_CHANNEL_OPEN_CHANNEL
 
     /* GPADL for the channel's ring buffer. */
 
-    GPADL_HANDLE    RingBufferGpadlHandle;
+    u32 RingBufferGpadlHandle;
 
 
     /* GPADL for the channel's server context save area. */
 
-    GPADL_HANDLE    ServerContextAreaGpadlHandle;
+    u32 ServerContextAreaGpadlHandle;
 
 
     /*
diff --git a/drivers/staging/hv/include/VmbusChannelInterface.h b/drivers/staging/hv/include/VmbusChannelInterface.h
index 953e1560980b..26742823748d 100644
--- a/drivers/staging/hv/include/VmbusChannelInterface.h
+++ b/drivers/staging/hv/include/VmbusChannelInterface.h
@@ -47,7 +47,7 @@
  * At the center of the Channel Management library is the Channel Offer. This
  * struct contains the fundamental information about an offer.
  */
-typedef struct {
+struct vmbus_channel_offer {
 	struct hv_guid InterfaceType;
 	struct hv_guid InterfaceInstance;
 	u64 InterruptLatencyIn100nsUnits;
@@ -75,9 +75,7 @@ typedef struct {
 		} Pipe;
 	} u;
 	u32 Padding;
-} __attribute__((packed)) VMBUS_CHANNEL_OFFER, *PVMBUS_CHANNEL_OFFER;
-
-typedef u32 GPADL_HANDLE;
+} __attribute__((packed));
 
 /* Server Flags */
 #define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE	1
diff --git a/drivers/staging/hv/include/nvspprotocol.h b/drivers/staging/hv/include/nvspprotocol.h
index 2ee9dbf0899a..5e7e03cf851b 100644
--- a/drivers/staging/hv/include/nvspprotocol.h
+++ b/drivers/staging/hv/include/nvspprotocol.h
@@ -143,7 +143,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_NDIS_VERSION
 
 typedef struct _NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER
 {
-    GPADL_HANDLE                            GpadlHandle;
+    u32 GpadlHandle;
     u16                                  Id;
 } NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER, *PNVSP_1_MESSAGE_SEND_RECEIVE_BUFFER;
 
@@ -202,7 +202,7 @@ typedef struct _NVSP_1_MESSAGE_REVOKE_RECEIVE_BUFFER
 
 typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER
 {
-    GPADL_HANDLE                            GpadlHandle;
+    u32 GpadlHandle;
     u16                                  Id;
 } NVSP_1_MESSAGE_SEND_SEND_BUFFER, *PNVSP_1_MESSAGE_SEND_SEND_BUFFER;