From b509bf5badcd30b1c163349a87a56933b59663e1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2009 15:11:45 -0700 Subject: [PATCH] Staging: hv: remove ULONGLONG and LONGLONG typedefs The ULONGLONG and LONGLONG typedefs are now removed from the Hyper-V driver code. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/include/VmbusPacketFormat.h | 2 +- drivers/staging/hv/include/osd.h | 3 --- drivers/staging/hv/include/vstorage.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/hv/include/VmbusPacketFormat.h b/drivers/staging/hv/include/VmbusPacketFormat.h index 78c4ca02a97c..04c3a0283a79 100644 --- a/drivers/staging/hv/include/VmbusPacketFormat.h +++ b/drivers/staging/hv/include/VmbusPacketFormat.h @@ -44,7 +44,7 @@ typedef struct volatile u32 In; // Offset in bytes from the ring base volatile u32 Out; // Offset in bytes from the ring base }; - volatile LONGLONG InOut; + volatile long long InOut; }; // diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index 48d8c49c8c5c..30903549b00b 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -97,15 +97,12 @@ typedef struct _DLIST_ENTRY { // // unsigned types // - -typedef unsigned long long ULONGLONG; typedef unsigned int ULONG; // // signed types // typedef int LONG; -typedef long long LONGLONG; // // Other types diff --git a/drivers/staging/hv/include/vstorage.h b/drivers/staging/hv/include/vstorage.h index 680788b308e1..9b6d3a1e70c0 100644 --- a/drivers/staging/hv/include/vstorage.h +++ b/drivers/staging/hv/include/vstorage.h @@ -196,7 +196,7 @@ typedef struct // vendor specific data in the inquirydata // - ULONGLONG UniqueId; + unsigned long long UniqueId; } VMSTORAGE_CHANNEL_PROPERTIES, *PVMSTORAGE_CHANNEL_PROPERTIES;