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

Commit 1496125e authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove MEMCMP_IO 



This patch removes MEMCMP_IO from commontypes.h and fixes the one use of the
macro so it calls uuid_cmp_le() instead. The old code was comparing UUIDs
directly.

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

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -318,8 +318,8 @@ ULTRA_check_channel_client(void __iomem *pChannel, 
{

{

	if (uuid_le_cmp(expectedTypeGuid, NULL_UUID_LE) != 0)

	if (uuid_le_cmp(expectedTypeGuid, NULL_UUID_LE) != 0)

		/* caller wants us to verify type GUID */

		/* caller wants us to verify type GUID */

		if (MEMCMP_IO(&(((CHANNEL_HEADER __iomem *) (pChannel))->Type),

		if (uuid_le_cmp((((CHANNEL_HEADER __iomem *)(pChannel))->Type),

			   &expectedTypeGuid, sizeof(uuid_le)) != 0) {

			   expectedTypeGuid) != 0) {

			CHANNEL_GUID_MISMATCH(expectedTypeGuid, channelName,

			CHANNEL_GUID_MISMATCH(expectedTypeGuid, channelName,

					      "type", expectedTypeGuid,

					      "type", expectedTypeGuid,

					      ((CHANNEL_HEADER __iomem *)

					      ((CHANNEL_HEADER __iomem *)

drivers/staging/unisys/include/commontypes.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,6 @@ 




typedef u64 GUEST_PHYSICAL_ADDRESS;

typedef u64 GUEST_PHYSICAL_ADDRESS;





#define MEMCMP_IO(m1, m2, len) memcmp((void __force *)m1, m2, len)



#define INLINE inline

#define INLINE inline

#define OFFSETOF offsetof

#define OFFSETOF offsetof