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

Commit 2e20c4a7 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove MEMCPY functions from commontypes.h 



This patch removes MEMCPY, MEMCPY_FROMIO, and MEMCPY_TOIO from commontypes.h,
and switches all use of these macros to the appropriate built in definition.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c66843d

drivers/staging/unisys/channels/channel.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, u32 Queue, void *pSignal) 
	 */

	psignal = (char __iomem *)pqhdr + readq(&pqhdr->oSignalBase) +

		(head * readl(&pqhdr->SignalSize));

	MEMCPY_TOIO(psignal, pSignal, readl(&pqhdr->SignalSize));

	memcpy_toio(psignal, pSignal, readl(&pqhdr->SignalSize));



	VolatileBarrier();

	writel(head, &pqhdr->Head);
@@ -126,7 +126,7 @@ visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, u32 Queue, void *pSignal) 
	/* copy signal from tail location to the area pointed to by pSignal */

	psource = (char __iomem *) pqhdr + readq(&pqhdr->oSignalBase) +

		(tail * readl(&pqhdr->SignalSize));

	MEMCPY_FROMIO(pSignal, psource, readl(&pqhdr->SignalSize));

	memcpy_fromio(pSignal, psource, readl(&pqhdr->SignalSize));



	VolatileBarrier();

	writel(tail, &pqhdr->Tail);
@@ -183,7 +183,7 @@ SignalRemoveAll(pCHANNEL_HEADER pChannel, u32 Queue, void *pSignal) 
		psource =

		    (char *) pqhdr + pqhdr->oSignalBase +

		    (tail * pqhdr->SignalSize);

		MEMCPY((char *) pSignal + (pqhdr->SignalSize * signalCount),

		memcpy((char *) pSignal + (pqhdr->SignalSize * signalCount),

		       psource, pqhdr->SignalSize);



		VolatileBarrier();

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

+2 −2
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL { 
		if (clientStr) {					\

			chan->ChannelHeader.oClientString =		\

				OFFSETOF(type, clientString);		\

			MEMCPY(chan->clientString, clientStr,		\

			memcpy(chan->clientString, clientStr,		\

			       MINNUM(clientStrLen,			\

				      (u32) (MAX_CLIENTSTRING_LEN - 1))); \

			chan->clientString[MINNUM(clientStrLen,		\
@@ -846,7 +846,7 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x, 
	x->ChannelHeader.Size = COVER(bytes, 4096);

	x->ChannelHeader.Type = UltraVnicChannelProtocolGuid;

	x->ChannelHeader.ZoneGuid = NULL_UUID_LE;

	MEMCPY(x->vnic.macaddr, macaddr, MAX_MACADDR_LEN);

	memcpy(x->vnic.macaddr, macaddr, MAX_MACADDR_LEN);

	x->vnic.num_rcv_bufs = num_rcv_bufs;

	x->vnic.mtu = mtu;

	x->vnic.zoneGuid = zoneGuid;

drivers/staging/unisys/include/commontypes.h

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ typedef u64 GUEST_PHYSICAL_ADDRESS; 
#define OFFSETOF offsetof



#define MEMORYBARRIER mb()

#define MEMCPY(dest, src, len) memcpy(dest, src, len)

#define MEMCPY_TOIO(dest, src, len) memcpy_toio(dest, src, len)

#define MEMCPY_FROMIO(dest, src, len) memcpy_fromio(dest, src, len)



#define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \

			      lin, logCtx)				\