From ec03a7db3213031734c7e50d3841877c409b1b61 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 31 Jul 2014 12:00:55 -0400 Subject: [PATCH] staging: unisys: remove S64 type This patch switches all use of the S64 typedef to use the kernel's s64 type instead. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/include/commontypes.h | 2 -- drivers/staging/unisys/include/uisutils.h | 4 ++-- drivers/staging/unisys/visorchipset/file.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h index 4e89cdf8df95..fee1b21a27c8 100644 --- a/drivers/staging/unisys/include/commontypes.h +++ b/drivers/staging/unisys/include/commontypes.h @@ -30,8 +30,6 @@ #include #endif -#define S64 int64_t - #ifdef __KERNEL__ #ifdef CONFIG_X86_32 diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h index 26b69379638d..a1c193c5827e 100644 --- a/drivers/staging/unisys/include/uisutils.h +++ b/drivers/staging/unisys/include/uisutils.h @@ -262,7 +262,7 @@ Issue_VMCALL_IO_VISORSERIAL_ADDR(u64 *DiagChannelAddress) return result; } -static inline S64 Issue_VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET(void) +static inline s64 Issue_VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET(void) { u64 result = VMCALL_SUCCESS; u64 physaddr = 0; @@ -272,7 +272,7 @@ static inline S64 Issue_VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET(void) return result; } -static inline S64 Issue_VMCALL_MEASUREMENT_DO_NOTHING(void) +static inline s64 Issue_VMCALL_MEASUREMENT_DO_NOTHING(void) { u64 result = VMCALL_SUCCESS; u64 physaddr = 0; diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c index fccc4f0c3a49..bf2e546d76bf 100644 --- a/drivers/staging/unisys/visorchipset/file.c +++ b/drivers/staging/unisys/visorchipset/file.c @@ -190,8 +190,8 @@ visorchipset_ioctl(struct inode *inode, struct file *file, #endif { int rc = SUCCESS; - S64 adjustment; - S64 vrtc_offset; + s64 adjustment; + s64 vrtc_offset; DBGINF("entered visorchipset_ioctl, cmd=%d", cmd); switch (cmd) { case VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET: -- 2.11.0