From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Thu, 31 Jul 2014 16:00:56 +0000 (-0400)
Subject: staging: unisys: remove non-kernel code from commontypes.h
X-Git-Tag: android-x86-4.4-r2~729^2~26
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f6f7005abe631dc207089256112099390da00969;p=android-x86%2Fkernel.git

staging: unisys: remove non-kernel code from commontypes.h

This patch deletes everything in common types that was in the else section
of a #ifdef __KERNEL__ block.

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

diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h
index fee1b21a27c8..2aac0ddeaffb 100644
--- a/drivers/staging/unisys/include/commontypes.h
+++ b/drivers/staging/unisys/include/commontypes.h
@@ -20,17 +20,10 @@
  * similar abbreviated content */
 #define _SUPERVISOR_COMMONTYPES_H_
 
-#ifdef __KERNEL__
 #include <linux/types.h>
 #include <linux/version.h>
 #include <linux/io.h>
 #include <linux/uuid.h>
-#else
-#include <stdint.h>
-#include <syslog.h>
-#endif
-
-#ifdef __KERNEL__
 
 #ifdef CONFIG_X86_32
 #define UINTN u32
@@ -38,19 +31,6 @@
 #define UINTN u64
 #endif
 
-#else
-
-#include <stdint.h>
-#if __WORDSIZE == 32
-#define UINTN u32
-#elif __WORDSIZE == 64
-#define UINTN u64
-#else
-#error Unsupported __WORDSIZE
-#endif
-
-#endif
-
 typedef u64 GUEST_PHYSICAL_ADDRESS;
 
 #define MEMSET(ptr, val, len) memset(ptr, val, len)
@@ -62,7 +42,6 @@ typedef u64 GUEST_PHYSICAL_ADDRESS;
 #define INLINE inline
 #define OFFSETOF offsetof
 
-#ifdef __KERNEL__
 #define MEMORYBARRIER mb()
 #define MEMCPY(dest, src, len) memcpy(dest, src, len)
 #define MEMCPY_TOIO(dest, src, len) memcpy_toio(dest, src, len)
@@ -99,47 +78,6 @@ typedef u64 GUEST_PHYSICAL_ADDRESS;
 		      LineNumber, Str, args...)				\
 	pr_info(Str, ## args)
 
-#else
-#define MEMCPY(dest, src, len) memcpy(dest, src, len)
-
-#define MEMORYBARRIER mb()
-
-#define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \
-			      lin, logCtx)				\
-	do {								\
-		syslog(LOG_USER | LOG_ERR,				\
-		       "Channel mismatch on channel=%s(%pUL) field=%s expected=%pUL actual=%pUL @%s:%d", \
-		       chName, &chType, field,	\
-		       &expected, &actual, \
-		       fil, lin);					\
-	} while (0)
-
-#define CHANNEL_U32_MISMATCH(chType, chName, field, expected, actual, fil, \
-			     lin, logCtx)				\
-	do {								\
-		syslog(LOG_USER | LOG_ERR,				\
-		       "Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8lx actual=0x%-8.8lx @%s:%d", \
-		       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 {								\
-		syslog(LOG_USER | LOG_ERR,				\
-		       "Channel mismatch on channel=%s(%pUL) field=%s expected=0x%-8.8Lx actual=0x%-8.8Lx @%s:%d", \
-		       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...)				\
-	syslog(LOG_USER | LOG_INFO, Str, ## args)
-#endif
-
 #define VolatileBarrier() MEMORYBARRIER
 
 #endif