From 30de72dbb54f3ea92fd83f086bc5c00b28277971 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 31 Jul 2014 12:00:59 -0400 Subject: [PATCH] staging: unisys: remove MEMSET define Remove the redundant MEMSET define in commontypes.h and fix everyplace that uses it. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/common-spar/include/channels/channel.h | 2 +- drivers/staging/unisys/common-spar/include/channels/iochannel.h | 6 +++--- drivers/staging/unisys/include/commontypes.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h index c1ba1de97985..7c85e4308e89 100644 --- a/drivers/staging/unisys/common-spar/include/channels/channel.h +++ b/drivers/staging/unisys/common-spar/include/channels/channel.h @@ -290,7 +290,7 @@ typedef struct _SIGNAL_QUEUE_HEADER { #define SignalInit(chan, QHDRFLD, QDATAFLD, QDATATYPE, ver, typ) \ do { \ - MEMSET(&chan->QHDRFLD, 0, sizeof(chan->QHDRFLD)); \ + memset(&chan->QHDRFLD, 0, sizeof(chan->QHDRFLD)); \ chan->QHDRFLD.VersionId = ver; \ chan->QHDRFLD.Type = typ; \ chan->QHDRFLD.Size = sizeof(chan->QDATAFLD); \ diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h index 9f2e1e1abaee..24e11858e0ee 100644 --- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h @@ -376,7 +376,7 @@ struct uiscmdrsp_scsi { #define SET_NO_DISK_INQUIRY_RESULT(buf, len, lun, lun0notpresent, notpresent) \ do { \ - MEMSET(buf, 0, \ + memset(buf, 0, \ MINNUM(len, \ (unsigned int) NO_DISK_INQUIRY_RESULT_LEN)); \ buf[2] = (u8) SCSI_SPC2_VER; \ @@ -802,7 +802,7 @@ static inline int ULTRA_VHBA_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x, struct vhba_config_max *max, unsigned char *clientStr, u32 clientStrLen, u64 bytes) { - MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL)); + memset(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL)); x->ChannelHeader.VersionId = ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID; x->ChannelHeader.Signature = ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE; x->ChannelHeader.SrvState = CHANNELSRV_UNINITIALIZED; @@ -838,7 +838,7 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x, unsigned char *clientStr, u32 clientStrLen, u64 bytes) { - MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL)); + memset(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL)); x->ChannelHeader.VersionId = ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID; x->ChannelHeader.Signature = ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE; x->ChannelHeader.SrvState = CHANNELSRV_UNINITIALIZED; diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h index 7fdf207297de..3540976fabc2 100644 --- a/drivers/staging/unisys/include/commontypes.h +++ b/drivers/staging/unisys/include/commontypes.h @@ -27,7 +27,6 @@ typedef u64 GUEST_PHYSICAL_ADDRESS; -#define MEMSET(ptr, val, len) memset(ptr, val, len) #define MEMCMP_IO(m1, m2, len) memcmp((void __force *)m1, m2, len) #define INLINE inline -- 2.11.0