staging: unisys: move remaining macros from commontypes.h to channel.h

All of the remaining macros in commontypes.h - the CHANNEL_*_MISMATCH macros
and UltraLogEvent() - are used only in channel.h. Move the entire set of them
to their new home.

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 bc923336fabdc08836bd413b67dfb4fe47604a11..d861a3fbf9b7c5f461f25939e80844b5471eb071 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -50,6 +50,37 @@
 
 #define ULTRA_CHANNEL_PROTOCOL_SIGNATURE  SIGNATURE_32('E', 'C', 'N', 'L')
 
+#define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \
+                             lin, logCtx)                              \
+       do {                                                            \
+               pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=%pUL actual=%pUL @%s:%d\n", \
+                      chName, &chType, field,  \
+                      &expected, &actual, \
+                      fil, lin);                                       \
+       } while (0)
+#define CHANNEL_U32_MISMATCH(chType, chName, field, expected, actual, fil, \
+                            lin, logCtx)                               \
+       do {                                                            \
+               pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8lx actual=0x%-8.8lx @%s:%d\n", \
+                      chName, &chType, field,  \
+                      (unsigned long)expected, (unsigned long)actual,  \
+                      fil, lin);                                       \
+       } while (0)
+
+#define CHANNEL_U64_MISMATCH(chType, chName, field, expected, actual, fil, \
+                            lin, logCtx)                               \
+       do {                                                            \
+               pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8Lx actual=0x%-8.8Lx @%s:%d\n", \
+                      chName, &chType, field,  \
+                      (unsigned long long)expected,                    \
+                      (unsigned long long)actual,                      \
+                      fil, lin);                                       \
+       } while (0)
+
+#define UltraLogEvent(logCtx, EventId, Severity, SubsystemMask, pFunctionName, \
+                     LineNumber, Str, args...)                         \
+       pr_info(Str, ## args)
+
 typedef enum {
        CHANNELSRV_UNINITIALIZED = 0,   /* channel is in an undefined state */
        CHANNELSRV_READY = 1    /* channel has been initialized by server */

diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h
index 0ed7f50cd20c18c1fb1c462bec47f44fbd17d4b4..eafd83b41cf0f814bf9df5f7ee4a9a8af706dc9d 100644 (file)
--- a/drivers/staging/unisys/include/commontypes.h
+++ b/drivers/staging/unisys/include/commontypes.h
@@ -25,36 +25,5 @@
 #include <linux/io.h>
 #include <linux/uuid.h>
 
-#define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \
-                             lin, logCtx)                              \
-       do {                                                            \
-               pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=%pUL actual=%pUL @%s:%d\n", \
-                      chName, &chType, field,  \
-                      &expected, &actual, \
-                      fil, lin);                                       \
-       } while (0)
-#define CHANNEL_U32_MISMATCH(chType, chName, field, expected, actual, fil, \
-                            lin, logCtx)                               \
-       do {                                                            \
-               pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8lx actual=0x%-8.8lx @%s:%d\n", \
-                      chName, &chType, field,  \
-                      (unsigned long)expected, (unsigned long)actual,  \
-                      fil, lin);                                       \
-       } while (0)
-
-#define CHANNEL_U64_MISMATCH(chType, chName, field, expected, actual, fil, \
-                            lin, logCtx)                               \
-       do {                                                            \
-               pr_err("Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8Lx actual=0x%-8.8Lx @%s:%d\n", \
-                      chName, &chType, field,  \
-                      (unsigned long long)expected,                    \
-                      (unsigned long long)actual,                      \
-                      fil, lin);                                       \
-       } while (0)
-
-#define UltraLogEvent(logCtx, EventId, Severity, SubsystemMask, pFunctionName, \
-                     LineNumber, Str, args...)                         \
-       pr_info(Str, ## args)
-
 #endif