Gitweb: http://git.kernel.org/linus/2be8093ac39fa59d9e451f4bf81e1fee38e23bbb
Commit: 2be8093ac39fa59d9e451f4bf81e1fee38e23bbb
Parent: 59471438ccbebafb0d63baf8b818d0ca692f882a
Author: Greg Kroah-Hartman <gregkh@suse.de>
AuthorDate: Tue Jul 14 15:11:03 2009 -0700
Committer: Greg Kroah-Hartman <gregkh@suse.de>
CommitDate: Tue Sep 15 12:01:46 2009 -0700
Staging: hv: remove USHORT typedef
The USHORT typedef is now removed from the Hyper-V driver code.
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/hv/include/osd.h | 1 -
drivers/staging/hv/include/vstorage.h | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index 4e54f66..48d8c49 100644
--- 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
diff --git a/drivers/staging/hv/include/vstorage.h b/drivers/staging/hv/include/vstorage.h
index 442c8c3..680788b 100644
--- 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) == 0);
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;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
