From: Benjamin Romer Date: Thu, 31 Jul 2014 16:00:58 +0000 (-0400) Subject: staging: unisys: remove UINTN type X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90f3b509bf9be3a8ce6cbd22474b188eba998d1e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Greg Kroah-Hartman --- 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 #include -#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)