Staging: hv: remove include/HvTypes.h

[mirror_ubuntu-bionic-kernel.git] / drivers / staging / hv / Hv.h

diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index 851e6472bf859e48bb25e4009057a3720809cec3..f9fcfed8df5c88eb2557afcfb72a25a688130af6 100644 (file)
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -25,9 +25,6 @@
 #ifndef __HV_H__
 #define __HV_H__
 
-#include "include/osd.h"
-
-#include "include/HvTypes.h"
 #include "include/HvStatus.h"
 #include "include/HvHalApi.h"
 #include "include/HvVpApi.h"
@@ -94,8 +91,8 @@ enum {
 /* #define VMBUS_PORT_ID               11 */
 
 /* 628180B8-308D-4c5e-B7DB-1BEB62E62EF4 */
-static const GUID VMBUS_SERVICE_ID = {
-       .Data = {
+static const struct hv_guid VMBUS_SERVICE_ID = {
+       .data = {
                0xb8, 0x80, 0x81, 0x62, 0x8d, 0x30, 0x5e, 0x4c,
                0xb7, 0xdb, 0x1b, 0xeb, 0x62, 0xe6, 0x2e, 0xf4
        },
@@ -104,12 +101,12 @@ static const GUID VMBUS_SERVICE_ID = {
 #define MAX_NUM_CPUS   1
 
 
-typedef struct {
+struct hv_input_signal_event_buffer {
        u64 Align8;
        HV_INPUT_SIGNAL_EVENT Event;
-} HV_INPUT_SIGNAL_EVENT_BUFFER;
+};
 
-typedef struct {
+struct hv_context {
        /* XenLinux or native Linux. If XenLinux, the hypercall and synic pages
         * has already been initialized */
        u64 GuestId;
@@ -122,15 +119,15 @@ typedef struct {
         * This is used as an input param to HvCallSignalEvent hypercall. The
         * input param is immutable in our usage and must be dynamic mem (vs
         * stack or global). */
-       HV_INPUT_SIGNAL_EVENT_BUFFER *SignalEventBuffer;
+       struct hv_input_signal_event_buffer *SignalEventBuffer;
        /* 8-bytes aligned of the buffer above */
        HV_INPUT_SIGNAL_EVENT *SignalEventParam;
 
        void *synICMessagePage[MAX_NUM_CPUS];
        void *synICEventPage[MAX_NUM_CPUS];
-} HV_CONTEXT;
+};
 
-extern HV_CONTEXT gHvContext;
+extern struct hv_context gHvContext;
 
 
 /* Hv Interface */