From foo@baz Tue Jul 14 15:11:03 PDT 2009 Date: Tue, 14 Jul 2009 15:11:03 -0700 To: Greg KH From: Greg Kroah-Hartman Subject: Staging: hv: remove USHORT typedef From: Greg Kroah-Hartman The USHORT typedef is now removed from the Hyper-V driver code. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/include/osd.h | 1 - drivers/staging/hv/include/vstorage.h | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -100,7 +100,6 @@ typedef struct _DLIST_ENTRY { typedef unsigned long long ULONGLONG; typedef unsigned int ULONG; -typedef unsigned short USHORT; // // signed types --- a/drivers/staging/hv/include/vstorage.h +++ b/drivers/staging/hv/include/vstorage.h @@ -141,7 +141,7 @@ C_ASSERT(SENSE_BUFFER_SIZE == 0x12); typedef struct { - USHORT Length; + unsigned short Length; unsigned char SrbStatus; unsigned char ScsiStatus; @@ -178,7 +178,7 @@ C_ASSERT((sizeof(VMSCSI_REQUEST) % 4) == typedef struct { - USHORT ProtocolVersion; + unsigned short ProtocolVersion; unsigned char PathId; unsigned char TargetId; @@ -213,7 +213,7 @@ typedef struct // Major (MSW) and minor (LSW) version numbers. // - USHORT MajorMinor; + unsigned short MajorMinor; // @@ -222,7 +222,7 @@ typedef struct // indicate incompatibility--but it does indicate mismatched builds. // - USHORT Revision; + unsigned short Revision; } VMSTORAGE_PROTOCOL_VERSION, *PVMSTORAGE_PROTOCOL_VERSION;