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

Commit 30de72db authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove MEMSET define 



Remove the redundant MEMSET define in commontypes.h and fix everyplace that
uses it.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -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);		\

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

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/unisys/include/commontypes.h

+0 −1
Original line number Diff line number Diff line
@@ -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