Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15fe5f2c authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

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: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e4701ae

drivers/staging/unisys/common-spar/include/channels/channel.h

+31 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/unisys/include/commontypes.h

+0 −31
Original line number Diff line number Diff line
@@ -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