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: Benjamin Romer <benjamin.romer@xxxxxxxxxx>
---
drivers/staging/unisys/common-spar/include/channels/channel.h | 4 ++--
drivers/staging/unisys/include/commontypes.h | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 7c85e43..15a8d6b 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -318,8 +318,8 @@ ULTRA_check_channel_client(void __iomem *pChannel,
{
if (uuid_le_cmp(expectedTypeGuid, NULL_UUID_LE) != 0)
/* caller wants us to verify type GUID */
- if (MEMCMP_IO(&(((CHANNEL_HEADER __iomem *) (pChannel))->Type),
- &expectedTypeGuid, sizeof(uuid_le)) != 0) {
+ if (uuid_le_cmp((((CHANNEL_HEADER __iomem *)(pChannel))->Type),
+ expectedTypeGuid) != 0) {
CHANNEL_GUID_MISMATCH(expectedTypeGuid, channelName,
"type", expectedTypeGuid,
((CHANNEL_HEADER __iomem *)
diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h
index 3540976..4311e9f 100644
--- a/drivers/staging/unisys/include/commontypes.h
+++ b/drivers/staging/unisys/include/commontypes.h
@@ -27,8 +27,6 @@
typedef u64 GUEST_PHYSICAL_ADDRESS;
-#define MEMCMP_IO(m1, m2, len) memcmp((void __force *)m1, m2, len)
-
#define INLINE inline
#define OFFSETOF offsetof
--
1.9.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
