summaryrefslogtreecommitdiffstats
path: root/drivers/staging/unisys/include/commontypes.h
diff options
context:
space:
mode:
authorBenjamin Romer2014-07-31 18:00:51 +0200
committerGreg Kroah-Hartman2014-08-01 23:38:44 +0200
commit5fc0229ae5e68b8b20552b3b1944255583476c35 (patch)
tree025517b0937550d48ace43f9cd326e5e73c217c0 /drivers/staging/unisys/include/commontypes.h
parentstaging: unisys: remove U32 type (diff)
downloadkernel-qcow2-linux-5fc0229ae5e68b8b20552b3b1944255583476c35.tar.gz
kernel-qcow2-linux-5fc0229ae5e68b8b20552b3b1944255583476c35.tar.xz
kernel-qcow2-linux-5fc0229ae5e68b8b20552b3b1944255583476c35.zip
staging: unisys: remove U64 type
This patch switches all use of the U64 typedef to use the kernel's u64 type instead. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/include/commontypes.h')
-rw-r--r--drivers/staging/unisys/include/commontypes.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h
index 48da47fcd8d1..2369099c56e2 100644
--- a/drivers/staging/unisys/include/commontypes.h
+++ b/drivers/staging/unisys/include/commontypes.h
@@ -30,7 +30,6 @@
#include <syslog.h>
#endif
-#define U64 uint64_t
#define S8 int8_t
#define S16 int16_t
#define S32 int32_t
@@ -41,7 +40,7 @@
#ifdef CONFIG_X86_32
#define UINTN u32
#else
-#define UINTN U64
+#define UINTN u64
#endif
#else
@@ -50,14 +49,14 @@
#if __WORDSIZE == 32
#define UINTN u32
#elif __WORDSIZE == 64
-#define UINTN U64
+#define UINTN u64
#else
#error Unsupported __WORDSIZE
#endif
#endif
-typedef U64 GUEST_PHYSICAL_ADDRESS;
+typedef u64 GUEST_PHYSICAL_ADDRESS;
#define MEMSET(ptr, val, len) memset(ptr, val, len)
#define MEMCMP(m1, m2, len) memcmp(m1, m2, len)
@@ -120,7 +119,7 @@ typedef U64 GUEST_PHYSICAL_ADDRESS;
fil, lin); \
} while (0)
-#define CHANNEL_u32_MISMATCH(chType, chName, field, expected, actual, fil, \
+#define CHANNEL_U32_MISMATCH(chType, chName, field, expected, actual, fil, \
lin, logCtx) \
do { \
syslog(LOG_USER | LOG_ERR, \