diff options
author | Benjamin Romer | 2014-05-06 15:58:23 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2014-05-18 18:45:15 +0200 |
commit | 90addb0218d47a886c846a22d75979fe5bf3471b (patch) | |
tree | 274120a820358bbaf555b10d9ccd7cbe153813a2 /drivers/staging/unisys/visorchipset/visorchipset.h | |
parent | Staging: unisys: visorutil: Add MODULE_LICENSE("GPL") (diff) | |
download | kernel-qcow2-linux-90addb0218d47a886c846a22d75979fe5bf3471b.tar.gz kernel-qcow2-linux-90addb0218d47a886c846a22d75979fe5bf3471b.tar.xz kernel-qcow2-linux-90addb0218d47a886c846a22d75979fe5bf3471b.zip |
staging: unisys: Replace GUID with uuid_le
This patch replaces the GUID type with uuid_le. It removes the header file
guidutils.h, updates all uses of the GUID type to uuid_le, and replaces all
function calls that used the GUID type with their uuid_le equivalents.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visorchipset/visorchipset.h')
-rw-r--r-- | drivers/staging/unisys/visorchipset/visorchipset.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h index 06646e4e3f1e..e01cc7207bae 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset.h +++ b/drivers/staging/unisys/visorchipset/visorchipset.h @@ -18,6 +18,8 @@ #ifndef __VISORCHIPSET_H__ #define __VISORCHIPSET_H__ +#include <linux/uuid.h> + #include "timskmod.h" #include "channel.h" #include "controlvmchannel.h" @@ -63,8 +65,8 @@ typedef struct { HOSTADDRESS channelAddr; struct InterruptInfo intr; U64 nChannelBytes; - GUID channelTypeGuid; - GUID channelInstGuid; + uuid_le channelTypeGuid; + uuid_le channelInstGuid; } VISORCHIPSET_CHANNEL_INFO; @@ -77,7 +79,7 @@ typedef struct { struct list_head entry; U32 busNo; U32 devNo; - GUID devInstGuid; + uuid_le devInstGuid; VISORCHIPSET_STATE state; VISORCHIPSET_CHANNEL_INFO chanInfo; U32 Reserved1; /* CONTROLVM_ID */ @@ -125,7 +127,7 @@ typedef struct { U32 busNo; VISORCHIPSET_STATE state; VISORCHIPSET_CHANNEL_INFO chanInfo; - GUID partitionGuid; + uuid_le partitionGuid; U64 partitionHandle; U8 *name; /* UTF8 */ U8 *description; /* UTF8 */ @@ -161,7 +163,7 @@ findbus(struct list_head *list, U32 busNo) typedef struct { U32 switchNo; VISORCHIPSET_STATE state; - GUID switchTypeGuid; + uuid_le switchTypeGuid; U8 *authService1; U8 *authService2; U8 *authService3; @@ -181,7 +183,7 @@ typedef struct { U32 switchNo; U32 externalPortNo; VISORCHIPSET_STATE state; - GUID networkZoneGuid; + uuid_le networkZoneGuid; int pdPort; U8 *ip; U8 *ipNetmask; @@ -224,7 +226,7 @@ typedef struct { void (*device_destroy)(ulong busNo, ulong devNo); void (*device_pause)(ulong busNo, ulong devNo); void (*device_resume)(ulong busNo, ulong devNo); - int (*get_channel_info)(GUID typeGuid, ulong *minSize, + int (*get_channel_info)(uuid_le typeGuid, ulong *minSize, ulong *maxSize); } VISORCHIPSET_BUSDEV_NOTIFIERS; |