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: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 7c85e4308e89bc13c6cedd1a1a3d141545df4185..15a8d6b35dac304784e4543ab7f9792a364ac271 100644 (file)
--- 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 3540976fabc2a5786d631ec56b67a5864f95cfc7..4311e9f6200f620eb66e7699d1a9aead651ef0fb 100644 (file)
--- 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