Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90f3b509 authored Jul 31, 2014 by Benjamin Romer Committed by Greg Kroah-Hartman Aug 01, 2014

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>

parent 87b7307a

drivers/staging/unisys/common-spar/include/channels/channel.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -295,8 +295,8 @@ typedef struct _SIGNAL_QUEUE_HEADER {
	chan->QHDRFLD.Type = typ; \		chan->QHDRFLD.Type = typ; \
	chan->QHDRFLD.Size = sizeof(chan->QDATAFLD); \		chan->QHDRFLD.Size = sizeof(chan->QDATAFLD); \
	chan->QHDRFLD.SignalSize = sizeof(QDATATYPE); \		chan->QHDRFLD.SignalSize = sizeof(QDATATYPE); \
	chan->QHDRFLD.oSignalBase = (UINTN)(chan->QDATAFLD)- \		chan->QHDRFLD.oSignalBase = (u64)(chan->QDATAFLD)- \
	(UINTN)(&chan->QHDRFLD); \		(u64)(&chan->QHDRFLD); \
	chan->QHDRFLD.MaxSignalSlots = \		chan->QHDRFLD.MaxSignalSlots = \
	sizeof(chan->QDATAFLD)/sizeof(QDATATYPE); \		sizeof(chan->QDATAFLD)/sizeof(QDATATYPE); \
	chan->QHDRFLD.MaxSignals = chan->QHDRFLD.MaxSignalSlots-1; \		chan->QHDRFLD.MaxSignals = chan->QHDRFLD.MaxSignalSlots-1; \

drivers/staging/unisys/include/commontypes.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -25,12 +25,6 @@
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/uuid.h>		#include <linux/uuid.h>

	#ifdef CONFIG_X86_32
	#define UINTN u32
	#else
	#define UINTN u64
	#endif

	typedef u64 GUEST_PHYSICAL_ADDRESS;		typedef u64 GUEST_PHYSICAL_ADDRESS;

	#define MEMSET(ptr, val, len) memset(ptr, val, len)		#define MEMSET(ptr, val, len) memset(ptr, val, len)