[PATCH 10/12] staging: unisys: remove UINTN type
Benjamin Romer
benjamin.romer at unisys.com
Thu Jul 31 16:00:58 UTC 2014
This patch removes UINTN from commontypes.h, using u64 in the one spot this
type was used.
Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
---
drivers/staging/unisys/common-spar/include/channels/channel.h | 4 ++--
drivers/staging/unisys/include/commontypes.h | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 99533cf..c1ba1de 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -295,8 +295,8 @@ typedef struct _SIGNAL_QUEUE_HEADER {
chan->QHDRFLD.Type = typ; \
chan->QHDRFLD.Size = sizeof(chan->QDATAFLD); \
chan->QHDRFLD.SignalSize = sizeof(QDATATYPE); \
- chan->QHDRFLD.oSignalBase = (UINTN)(chan->QDATAFLD)- \
- (UINTN)(&chan->QHDRFLD); \
+ chan->QHDRFLD.oSignalBase = (u64)(chan->QDATAFLD)- \
+ (u64)(&chan->QHDRFLD); \
chan->QHDRFLD.MaxSignalSlots = \
sizeof(chan->QDATAFLD)/sizeof(QDATATYPE); \
chan->QHDRFLD.MaxSignals = chan->QHDRFLD.MaxSignalSlots-1; \
diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h
index b569c34..7fdf207 100644
--- a/drivers/staging/unisys/include/commontypes.h
+++ b/drivers/staging/unisys/include/commontypes.h
@@ -25,12 +25,6 @@
#include <linux/io.h>
#include <linux/uuid.h>
-#ifdef CONFIG_X86_32
-#define UINTN u32
-#else
-#define UINTN u64
-#endif
-
typedef u64 GUEST_PHYSICAL_ADDRESS;
#define MEMSET(ptr, val, len) memset(ptr, val, len)
--
1.9.1
More information about the devel
mailing list