staging: unisys: remove UINTN type

This patch removes UINTN from commontypes.h, using u64 in the one spot this
type was used.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 99533cfaf3dfea38b34b472f7d38c4a1dbe86cd2..c1ba1de9798532d7d3c775ac063a3a10d050e270 100644 (file)
--- 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 b569c348d0f84d148e4286da259e5e84172d778a..7fdf207297dec07a310d6a99419af0feb9c4e11b 100644 (file)
--- 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)