aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorBenjamin Romer <benjamin.romer@unisys.com>2014-07-31 12:01:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-01 14:38:45 -0700
commit1496125efd6b5852573d0c7ad5ebc7d60599b1b3 (patch)
tree735c5864e4e4cd50c7c22f1bea096dde286ad28e /drivers/staging
parent30de72dbb54f3ea92fd83f086bc5c00b28277971 (diff)
downloadlinux-stericsson-1496125efd6b5852573d0c7ad5ebc7d60599b1b3.tar.gz
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/channel.h4
-rw-r--r--drivers/staging/unisys/include/commontypes.h2
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 7c85e4308e89..15a8d6b35dac 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 3540976fabc2..4311e9f6200f 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