diff options
| author | Benjamin Romer <benjamin.romer@unisys.com> | 2014-07-31 12:00:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-01 14:38:45 -0700 |
| commit | 30de72dbb54f3ea92fd83f086bc5c00b28277971 (patch) | |
| tree | 6965033b1e8246c6e7fecdf24dc12490864ff600 /drivers/staging | |
| parent | 90f3b509bf9be3a8ce6cbd22474b188eba998d1e (diff) | |
staging: unisys: remove MEMSET define
Remove the redundant MEMSET define in commontypes.h and fix everyplace that
uses it.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
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 c1ba1de9798..7c85e4308e8 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 9f2e1e1abae..24e11858e0e 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 7fdf207297d..3540976fabc 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 |