diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-19 19:17:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:56 -0400 |
commit | caf26a31b51a148f70113700fd4f9860b5da3931 (patch) | |
tree | 3409b37bf85a952830cb423baa76b09ae7a19d85 /drivers/staging/hv/include | |
parent | 0ccafb365803b3256aa75fd07bf9e5c6814a260d (diff) |
Staging: hv: osd.h: remove GUID typedef
GUID should not be a typedef. As proof of the problem of typedefs,
look, we are passing 2 of these as a value in functions! Bah...
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/include')
-rw-r--r-- | drivers/staging/hv/include/List.h | 13 | ||||
-rw-r--r-- | drivers/staging/hv/include/NetVscApi.h | 6 | ||||
-rw-r--r-- | drivers/staging/hv/include/VmbusApi.h | 12 | ||||
-rw-r--r-- | drivers/staging/hv/include/VmbusChannelInterface.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/include/vmbus.h | 6 |
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 @@ | |||
32 | * | 32 | * |
33 | */ | 33 | */ |
34 | 34 | ||
35 | typedef DLIST_ENTRY LIST_ENTRY; | 35 | typedef struct _LIST_ENTRY { |
36 | typedef DLIST_ENTRY *PLIST_ENTRY; | 36 | struct _LIST_ENTRY *Flink; |
37 | 37 | struct _LIST_ENTRY *Blink; | |
38 | /* typedef struct LIST_ENTRY { */ | 38 | } LIST_ENTRY, *PLIST_ENTRY; |
39 | /* struct LIST_ENTRY * volatile Flink; */ | ||
40 | /* struct LIST_ENTRY * volatile Blink; */ | ||
41 | /* } LIST_ENTRY, *PLIST_ENTRY; */ | ||
42 | |||
43 | |||
44 | 39 | ||
45 | /* | 40 | /* |
46 | * void | 41 | * 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 @@ | |||
26 | #define _NETVSC_API_H_ | 26 | #define _NETVSC_API_H_ |
27 | 27 | ||
28 | #include "VmbusApi.h" | 28 | #include "VmbusApi.h" |
29 | 29 | #include "List.h" | |
30 | 30 | ||
31 | /* Defines */ | 31 | /* Defines */ |
32 | 32 | ||
@@ -56,7 +56,7 @@ typedef void (*PFN_ON_LINKSTATUS_CHANGED)(struct hv_device *dev, u32 Status); | |||
56 | 56 | ||
57 | /* Represent the xfer page packet which contains 1 or more netvsc packet */ | 57 | /* Represent the xfer page packet which contains 1 or more netvsc packet */ |
58 | typedef struct _XFERPAGE_PACKET { | 58 | typedef struct _XFERPAGE_PACKET { |
59 | DLIST_ENTRY ListEntry; | 59 | LIST_ENTRY ListEntry; |
60 | 60 | ||
61 | /* # of netvsc packets this xfer packet contains */ | 61 | /* # of netvsc packets this xfer packet contains */ |
62 | u32 Count; | 62 | u32 Count; |
@@ -72,7 +72,7 @@ typedef struct _XFERPAGE_PACKET { | |||
72 | */ | 72 | */ |
73 | struct hv_netvsc_packet { | 73 | struct hv_netvsc_packet { |
74 | /* Bookkeeping stuff */ | 74 | /* Bookkeeping stuff */ |
75 | DLIST_ENTRY ListEntry; | 75 | LIST_ENTRY ListEntry; |
76 | 76 | ||
77 | struct hv_device *Device; | 77 | struct hv_device *Device; |
78 | bool IsDataPacket; | 78 | 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); | |||
76 | typedef void (*PFN_ON_DPC)(struct hv_driver *drv); | 76 | typedef void (*PFN_ON_DPC)(struct hv_driver *drv); |
77 | typedef void (*PFN_GET_CHANNEL_OFFERS)(void); | 77 | typedef void (*PFN_GET_CHANNEL_OFFERS)(void); |
78 | 78 | ||
79 | typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(GUID DeviceType, GUID DeviceInstance, void *Context); | 79 | typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(struct hv_guid DeviceType, struct hv_guid DeviceInstance, void *Context); |
80 | typedef void (*PFN_ON_CHILDDEVICE_DESTROY)(struct hv_device *Device); | 80 | typedef void (*PFN_ON_CHILDDEVICE_DESTROY)(struct hv_device *Device); |
81 | typedef int (*PFN_ON_CHILDDEVICE_ADD)(struct hv_device *RootDevice, struct hv_device *ChildDevice); | 81 | typedef int (*PFN_ON_CHILDDEVICE_ADD)(struct hv_device *RootDevice, struct hv_device *ChildDevice); |
82 | typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(struct hv_device *Device); | 82 | typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(struct hv_device *Device); |
@@ -165,8 +165,8 @@ typedef struct _PORT_INFO { | |||
165 | typedef struct _DEVICE_INFO { | 165 | typedef struct _DEVICE_INFO { |
166 | u32 ChannelId; | 166 | u32 ChannelId; |
167 | u32 ChannelState; | 167 | u32 ChannelState; |
168 | GUID ChannelType; | 168 | struct hv_guid ChannelType; |
169 | GUID ChannelInstance; | 169 | struct hv_guid ChannelInstance; |
170 | 170 | ||
171 | u32 MonitorId; | 171 | u32 MonitorId; |
172 | u32 ServerMonitorPending; | 172 | u32 ServerMonitorPending; |
@@ -200,7 +200,7 @@ typedef void (*VMBUS_GET_CHANNEL_INTERFACE)(VMBUS_CHANNEL_INTERFACE *Interface); | |||
200 | /* Base driver object */ | 200 | /* Base driver object */ |
201 | struct hv_driver { | 201 | struct hv_driver { |
202 | const char* name; | 202 | const char* name; |
203 | GUID deviceType; /* the device type supported by this driver */ | 203 | struct hv_guid deviceType; /* the device type supported by this driver */ |
204 | 204 | ||
205 | PFN_ON_DEVICEADD OnDeviceAdd; | 205 | PFN_ON_DEVICEADD OnDeviceAdd; |
206 | PFN_ON_DEVICEREMOVE OnDeviceRemove; | 206 | PFN_ON_DEVICEREMOVE OnDeviceRemove; |
@@ -215,8 +215,8 @@ struct hv_driver { | |||
215 | struct hv_device { | 215 | struct hv_device { |
216 | struct hv_driver *Driver; /* the driver for this device */ | 216 | struct hv_driver *Driver; /* the driver for this device */ |
217 | char name[64]; | 217 | char name[64]; |
218 | GUID deviceType; /* the device type id of this device */ | 218 | struct hv_guid deviceType; /* the device type id of this device */ |
219 | GUID deviceInstance; /* the device instance id of this device */ | 219 | struct hv_guid deviceInstance; /* the device instance id of this device */ |
220 | void* context; | 220 | void* context; |
221 | void* Extension; /* Device extension; */ | 221 | void* Extension; /* Device extension; */ |
222 | }; | 222 | }; |
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 @@ | |||
64 | typedef struct | 64 | typedef struct |
65 | { | 65 | { |
66 | 66 | ||
67 | GUID InterfaceType; | 67 | struct hv_guid InterfaceType; |
68 | GUID InterfaceInstance; | 68 | struct hv_guid InterfaceInstance; |
69 | u64 InterruptLatencyIn100nsUnits; | 69 | u64 InterruptLatencyIn100nsUnits; |
70 | u32 InterfaceRevision; | 70 | u32 InterfaceRevision; |
71 | u32 ServerContextAreaSize; /* in bytes */ | 71 | 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); | |||
37 | typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv); | 37 | typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv); |
38 | 38 | ||
39 | struct driver_context { | 39 | struct driver_context { |
40 | GUID class_id; | 40 | struct hv_guid class_id; |
41 | 41 | ||
42 | struct device_driver driver; | 42 | struct device_driver driver; |
43 | 43 | ||
@@ -49,8 +49,8 @@ struct driver_context { | |||
49 | 49 | ||
50 | struct device_context { | 50 | struct device_context { |
51 | struct work_struct probe_failed_work_item; | 51 | struct work_struct probe_failed_work_item; |
52 | GUID class_id; | 52 | struct hv_guid class_id; |
53 | GUID device_id; | 53 | struct hv_guid device_id; |
54 | int probe_error; | 54 | int probe_error; |
55 | struct device device; | 55 | struct device device; |
56 | struct hv_device device_obj; | 56 | struct hv_device device_obj; |