diff options
| author | Benjamin Romer <benjamin.romer@unisys.com> | 2014-07-31 12:00:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-01 14:38:45 -0700 |
| commit | 90f3b509bf9be3a8ce6cbd22474b188eba998d1e (patch) | |
| tree | c5d8634fdd01b2accc8fdd145db422c100b06a3e /drivers/staging | |
| parent | 87b7307ae1a3df1f474d4cc7deecc641862d0b87 (diff) | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/unisys/common-spar/include/channels/channel.h | 4 | ||||
| -rw-r--r-- | 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 99533cfaf3df..c1ba1de97985 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 b569c348d0f8..7fdf207297de 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) |