5 files changed, 18 insertions, 23 deletions
diff --git a/drivers/staging/hv/include/List.h b/drivers/staging/hv/include/List.h
index 3895c328ddd..735a938a218 100644
--- a/drivers/staging/hv/include/List.h
+++ b/drivers/staging/hv/include/List.h
@@ -32,15 +32,10 @@
  *
  */
 
-typedef DLIST_ENTRY LIST_ENTRY;
-typedef DLIST_ENTRY *PLIST_ENTRY;
-
-/* typedef struct LIST_ENTRY { */
-/*   struct LIST_ENTRY * volatile Flink; */
-/*   struct LIST_ENTRY * volatile Blink; */
-/* } LIST_ENTRY, *PLIST_ENTRY; */
-
-
+typedef struct _LIST_ENTRY {
+	struct _LIST_ENTRY *Flink;
+	struct _LIST_ENTRY *Blink;
+} LIST_ENTRY, *PLIST_ENTRY;
 
 /*
  *  void
diff --git a/drivers/staging/hv/include/NetVscApi.h b/drivers/staging/hv/include/NetVscApi.h
index 79b9e4b5a3a..f83c6fc8ed1 100644
--- a/drivers/staging/hv/include/NetVscApi.h
+++ b/drivers/staging/hv/include/NetVscApi.h
@@ -26,7 +26,7 @@
 #define _NETVSC_API_H_
 
 #include "VmbusApi.h"
-
+#include "List.h"
 
 /* Defines */
 
@@ -56,7 +56,7 @@ typedef void (*PFN_ON_LINKSTATUS_CHANGED)(struct hv_device *dev, u32 Status);
 
 /* Represent the xfer page packet which contains 1 or more netvsc packet */
 typedef struct _XFERPAGE_PACKET {
-	DLIST_ENTRY			ListEntry;
+	LIST_ENTRY ListEntry;
 
 	/* # of netvsc packets this xfer packet contains */
 	u32				Count;
@@ -72,7 +72,7 @@ typedef struct _XFERPAGE_PACKET {
  */
 struct hv_netvsc_packet {
 	/* Bookkeeping stuff */
-	DLIST_ENTRY				ListEntry;
+	LIST_ENTRY ListEntry;
 
 	struct hv_device *Device;
 	bool					IsDataPacket;
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index 442a2125470..e5a733790d0 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -76,7 +76,7 @@ typedef int	(*PFN_ON_ISR)(struct hv_driver *drv);
 typedef void (*PFN_ON_DPC)(struct hv_driver *drv);
 typedef void (*PFN_GET_CHANNEL_OFFERS)(void);
 
-typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(GUID DeviceType, GUID DeviceInstance, void *Context);
+typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(struct hv_guid DeviceType, struct hv_guid DeviceInstance, void *Context);
 typedef void (*PFN_ON_CHILDDEVICE_DESTROY)(struct hv_device *Device);
 typedef int (*PFN_ON_CHILDDEVICE_ADD)(struct hv_device *RootDevice, struct hv_device *ChildDevice);
 typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(struct hv_device *Device);
@@ -165,8 +165,8 @@ typedef struct _PORT_INFO {
 typedef struct _DEVICE_INFO {
 	u32		ChannelId;
 	u32		ChannelState;
-	GUID		ChannelType;
-	GUID		ChannelInstance;
+	struct hv_guid ChannelType;
+	struct hv_guid ChannelInstance;
 
 	u32						MonitorId;
 	u32						ServerMonitorPending;
@@ -200,7 +200,7 @@ typedef void (*VMBUS_GET_CHANNEL_INTERFACE)(VMBUS_CHANNEL_INTERFACE *Interface);
 /* Base driver object */
 struct hv_driver {
 	const char*				name;
-	GUID					deviceType; /* the device type supported by this driver */
+	struct hv_guid deviceType; /* the device type supported by this driver */
 
 	PFN_ON_DEVICEADD		OnDeviceAdd;
 	PFN_ON_DEVICEREMOVE		OnDeviceRemove;
@@ -215,8 +215,8 @@ struct hv_driver {
 struct hv_device {
 	struct hv_driver *Driver;		/* the driver for this device */
 	char				name[64];
-	GUID				deviceType; /* the device type id of this device */
-	GUID				deviceInstance; /* the device instance id of this device */
+	struct hv_guid deviceType; /* the device type id of this device */
+	struct hv_guid deviceInstance; /* the device instance id of this device */
 	void*				context;
 	void*				Extension;		/* Device extension; */
 };
diff --git a/drivers/staging/hv/include/VmbusChannelInterface.h b/drivers/staging/hv/include/VmbusChannelInterface.h
index 881c22d4c0e..8ee8a073c15 100644
--- a/drivers/staging/hv/include/VmbusChannelInterface.h
+++ b/drivers/staging/hv/include/VmbusChannelInterface.h
@@ -64,8 +64,8 @@
 typedef struct
 {
 
-    GUID    InterfaceType;
-    GUID    InterfaceInstance;
+    struct hv_guid InterfaceType;
+    struct hv_guid InterfaceInstance;
     u64  InterruptLatencyIn100nsUnits;
     u32  InterfaceRevision;
     u32  ServerContextAreaSize;  /* in bytes */
diff --git a/drivers/staging/hv/include/vmbus.h b/drivers/staging/hv/include/vmbus.h
index 6f7eecb4b83..2ea6ce0703c 100644
--- a/drivers/staging/hv/include/vmbus.h
+++ b/drivers/staging/hv/include/vmbus.h
@@ -37,7 +37,7 @@ typedef int (*PFN_DRIVERINITIALIZE)(struct hv_driver *drv);
 typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv);
 
 struct driver_context {
-	GUID					class_id;
+	struct hv_guid class_id;
 
 	struct device_driver	driver;
 
@@ -49,8 +49,8 @@ struct driver_context {
 
 struct device_context {
 	struct work_struct              probe_failed_work_item;
-	GUID					class_id;
-	GUID					device_id;
+	struct hv_guid class_id;
+	struct hv_guid device_id;
 	int						probe_error;
 	struct device			device;
 	struct hv_device device_obj;