kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: unisys: remove MEMCPY functions from commontypes.h

Browse source 
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: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Benjamin Romer 2014-08-02 22:03:37 -04:00 committed by Greg Kroah-Hartman
parent 6c66843dab
commit 2e20c4a7c8
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/unisys/channels/channel.c
View file

@ -73,7 +73,7 @@ visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, u32 Queue, void *pSignal)
*/ */
psignal = (char __iomem *)pqhdr + readq(&pqhdr->oSignalBase) + psignal = (char __iomem *)pqhdr + readq(&pqhdr->oSignalBase) +
(head * readl(&pqhdr->SignalSize)); (head * readl(&pqhdr->SignalSize));
MEMCPY_TOIO(psignal, pSignal, readl(&pqhdr->SignalSize)); memcpy_toio(psignal, pSignal, readl(&pqhdr->SignalSize));
VolatileBarrier(); VolatileBarrier();
writel(head, &pqhdr->Head); 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 */ /* copy signal from tail location to the area pointed to by pSignal */
psource = (char __iomem *) pqhdr + readq(&pqhdr->oSignalBase) + psource = (char __iomem *) pqhdr + readq(&pqhdr->oSignalBase) +
(tail * readl(&pqhdr->SignalSize)); (tail * readl(&pqhdr->SignalSize));
MEMCPY_FROMIO(pSignal, psource, readl(&pqhdr->SignalSize)); memcpy_fromio(pSignal, psource, readl(&pqhdr->SignalSize));
VolatileBarrier(); VolatileBarrier();
writel(tail, &pqhdr->Tail); writel(tail, &pqhdr->Tail);
@ -183,7 +183,7 @@ SignalRemoveAll(pCHANNEL_HEADER pChannel, u32 Queue, void *pSignal)
psource = psource =
(char *) pqhdr + pqhdr->oSignalBase + (char *) pqhdr + pqhdr->oSignalBase +
(tail * pqhdr->SignalSize); (tail * pqhdr->SignalSize);
MEMCPY((char *) pSignal + (pqhdr->SignalSize * signalCount), memcpy((char *) pSignal + (pqhdr->SignalSize * signalCount),
psource, pqhdr->SignalSize); psource, pqhdr->SignalSize);
VolatileBarrier(); VolatileBarrier();

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

@ -775,7 +775,7 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
if (clientStr) { \ if (clientStr) { \
chan->ChannelHeader.oClientString = \ chan->ChannelHeader.oClientString = \
OFFSETOF(type, clientString); \ OFFSETOF(type, clientString); \
MEMCPY(chan->clientString, clientStr, \ memcpy(chan->clientString, clientStr, \
MINNUM(clientStrLen, \ MINNUM(clientStrLen, \
(u32) (MAX_CLIENTSTRING_LEN - 1))); \ (u32) (MAX_CLIENTSTRING_LEN - 1))); \
chan->clientString[MINNUM(clientStrLen, \ 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.Size = COVER(bytes, 4096);
x->ChannelHeader.Type = UltraVnicChannelProtocolGuid; x->ChannelHeader.Type = UltraVnicChannelProtocolGuid;
x->ChannelHeader.ZoneGuid = NULL_UUID_LE; 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.num_rcv_bufs = num_rcv_bufs;
x->vnic.mtu = mtu; x->vnic.mtu = mtu;
x->vnic.zoneGuid = zoneGuid; x->vnic.zoneGuid = zoneGuid;

3
drivers/staging/unisys/include/commontypes.h
View file

@ -31,9 +31,6 @@ typedef u64 GUEST_PHYSICAL_ADDRESS;
#define OFFSETOF offsetof #define OFFSETOF offsetof
#define MEMORYBARRIER mb() #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, \ #define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \
lin, logCtx) \ lin, logCtx) \