staging: unisys: Fix sparse error - accessing __iomem directly
authorLuke Hart <luke.hart@birchleys.eu>
Fri, 12 Sep 2014 09:48:33 +0000 (10:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Sep 2014 23:08:09 +0000 (16:08 -0700)
Copy the channel type into a temporary buffer so that code will work
for architectures that don't support MMIO. This now works in same way
as other tests in same function.

Signed-off-by: Luke Hart <luke.hart@birchleys.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/common-spar/include/channels/channel.h

index 2004cfe1890da8fcd4398be7b06964250f809c89..5ba5e566be9afcc70e2f74f1dd537cdfe683b870 100644 (file)
@@ -347,10 +347,13 @@ ULTRA_check_channel_client(void __iomem *pChannel,
                           u64 expectedSignature,
                           char *fileName, int lineNumber, void *logCtx)
 {
-       if (uuid_le_cmp(expectedTypeGuid, NULL_UUID_LE) != 0)
+       if (uuid_le_cmp(expectedTypeGuid, NULL_UUID_LE) != 0) {
+               uuid_le guid;
+
+               ioread8_rep(&((CHANNEL_HEADER __iomem *)(pChannel))->Type,
+                       &guid, sizeof(guid));
                /* caller wants us to verify type GUID */
-               if (uuid_le_cmp((((CHANNEL_HEADER __iomem *)(pChannel))->Type),
-                          expectedTypeGuid) != 0) {
+               if (uuid_le_cmp(guid, expectedTypeGuid) != 0) {
                        CHANNEL_GUID_MISMATCH(expectedTypeGuid, channelName,
                                              "type", expectedTypeGuid,
                                              ((CHANNEL_HEADER __iomem *)
@@ -358,6 +361,7 @@ ULTRA_check_channel_client(void __iomem *pChannel,
                                              lineNumber, logCtx);
                        return 0;
                }
+       }
        if (expectedMinBytes > 0)       /* caller wants us to verify
                                         * channel size */
                if (readq(&((CHANNEL_HEADER __iomem *)