From 3abcbc45cb768ec84b9643bc8f141639dcfba4c3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2009 15:13:46 -0700 Subject: [PATCH] Staging: hv: remove ULONG and LONG typedefs The ULONG and LONG 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/StorVsc.c | 2 +- drivers/staging/hv/include/StorVscApi.h | 2 +- drivers/staging/hv/include/osd.h | 10 ---------- drivers/staging/hv/include/vstorage.h | 12 ++++++------ 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index 370162b94ba3..9cbd0641594f 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -62,7 +62,7 @@ typedef struct _STORVSC_DEVICE{ // Each unique Port/Path/Target represents 1 channel ie scsi controller. In reality, the pathid, targetid is always 0 // and the port is set by us - ULONG PortNumber; + unsigned int PortNumber; unsigned char PathId; unsigned char TargetId; diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h index 4df77dafdde1..f50fee7bafd6 100644 --- a/drivers/staging/hv/include/StorVscApi.h +++ b/drivers/staging/hv/include/StorVscApi.h @@ -117,7 +117,7 @@ typedef struct _STORVSC_DRIVER_OBJECT { } STORVSC_DRIVER_OBJECT; typedef struct _STORVSC_DEVICE_INFO { - ULONG PortNumber; + unsigned int PortNumber; unsigned char PathId; unsigned char TargetId; } STORVSC_DEVICE_INFO; diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index e06f4550695f..366e890762ac 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -95,16 +95,6 @@ typedef struct _DLIST_ENTRY { } DLIST_ENTRY; // -// unsigned types -// -typedef unsigned int ULONG; - -// -// signed types -// -typedef int LONG; - -// // Other types // typedef unsigned long SIZE_T; diff --git a/drivers/staging/hv/include/vstorage.h b/drivers/staging/hv/include/vstorage.h index 9b6d3a1e70c0..ada1f649e9ec 100644 --- a/drivers/staging/hv/include/vstorage.h +++ b/drivers/staging/hv/include/vstorage.h @@ -155,7 +155,7 @@ typedef struct unsigned char DataIn; unsigned char Reserved; - ULONG DataTransferLength; + unsigned int DataTransferLength; union { @@ -185,11 +185,11 @@ typedef struct // // Note: port number is only really known on the client side // - ULONG PortNumber; + unsigned int PortNumber; - ULONG Flags; + unsigned int Flags; - ULONG MaxTransferBytes; + unsigned int MaxTransferBytes; // // This id is unique for each channel and will correspond with @@ -249,13 +249,13 @@ typedef struct _VSTOR_PACKET // Flags - see below for values // - ULONG Flags; + unsigned int Flags; // // Status of the request returned from the server side. // - ULONG Status; + unsigned int Status; // // Data payload area -- 2.11.4.GIT