From 9debc12e2b1e58b09e1e81620ca9b44f18246464 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:19:28 -0700 Subject: [PATCH] Staging: epl: remove __KERNEL__ checks We are in the kernel, so these checks are pointless. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Benchmark.h | 9 --------- drivers/staging/epl/EplApiProcessImage.c | 21 +-------------------- drivers/staging/epl/EplSdoUdpu.c | 26 -------------------------- drivers/staging/epl/EplTarget.h | 11 ----------- drivers/staging/epl/SharedBuff.c | 7 ------- drivers/staging/epl/global.h | 7 ------- 6 files changed, 1 insertion(+), 80 deletions(-) --- a/drivers/staging/epl/Benchmark.h +++ b/drivers/staging/epl/Benchmark.h @@ -73,9 +73,6 @@ #include "global.h" -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) - -// #include #include #ifdef CONFIG_COLDFIRE @@ -90,12 +87,6 @@ #define BENCHMARK_MODULES 0x00000000 #endif -#else - // disable Benchmarking -#undef BENCHMARK_MODULES -#define BENCHMARK_MODULES 0x00000000 -#endif - /***************************************************************************/ /* */ /* */ --- a/drivers/staging/epl/EplApiProcessImage.c +++ b/drivers/staging/epl/EplApiProcessImage.c @@ -69,11 +69,8 @@ ****************************************************************************/ #include "Epl.h" -//#include "kernel/EplPdokCal.h" -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) -#include -#endif +#include /***************************************************************************/ /* */ @@ -285,19 +282,11 @@ tEplKernel EplApiProcessImageExchangeIn( tEplKernel Ret = kEplSuccessful; #if EPL_API_PROCESS_IMAGE_SIZE_IN > 0 -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) copy_to_user(pPI_p->m_pImage, EplApiProcessImageInstance_g.m_abProcessImageInput, min(pPI_p->m_uiSize, sizeof(EplApiProcessImageInstance_g. m_abProcessImageInput))); -#else - EPL_MEMCPY(pPI_p->m_pImage, - EplApiProcessImageInstance_g.m_abProcessImageInput, - min(pPI_p->m_uiSize, - sizeof(EplApiProcessImageInstance_g. - m_abProcessImageInput))); -#endif #endif return Ret; @@ -320,19 +309,11 @@ tEplKernel EplApiProcessImageExchangeOut tEplKernel Ret = kEplSuccessful; #if EPL_API_PROCESS_IMAGE_SIZE_OUT > 0 -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) copy_from_user(EplApiProcessImageInstance_g.m_abProcessImageOutput, pPI_p->m_pImage, min(pPI_p->m_uiSize, sizeof(EplApiProcessImageInstance_g. m_abProcessImageOutput))); -#else - EPL_MEMCPY(EplApiProcessImageInstance_g.m_abProcessImageOutput, - pPI_p->m_pImage, - min(pPI_p->m_uiSize, - sizeof(EplApiProcessImageInstance_g. - m_abProcessImageOutput))); -#endif #endif return Ret; --- a/drivers/staging/epl/EplSdoUdpu.c +++ b/drivers/staging/epl/EplSdoUdpu.c @@ -72,11 +72,9 @@ #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) #include "SocketLinuxKernel.h" #include #include -#endif /***************************************************************************/ /* */ @@ -110,12 +108,9 @@ typedef struct { tEplSequLayerReceiveCb m_fpSdoAsySeqCb; SOCKET m_UdpSocket; -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) struct completion m_CompletionUdpThread; int m_ThreadHandle; int m_iTerminateThread; -#endif - } tEplSdoUdpInstance; //--------------------------------------------------------------------------- @@ -128,9 +123,7 @@ static tEplSdoUdpInstance SdoUdpInstance // local function prototypes //--------------------------------------------------------------------------- -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) static int EplSdoUdpThread(void *pArg_p); -#endif /***************************************************************************/ /* */ @@ -214,11 +207,8 @@ tEplKernel EplSdoUdpuAddInstance(tEplSeq goto Exit; } -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) init_completion(&SdoUdpInstance_g.m_CompletionUdpThread); SdoUdpInstance_g.m_iTerminateThread = 0; -#endif - SdoUdpInstance_g.m_ThreadHandle = 0; SdoUdpInstance_g.m_UdpSocket = INVALID_SOCKET; @@ -254,13 +244,10 @@ tEplKernel EplSdoUdpuDelInstance(void) if (SdoUdpInstance_g.m_ThreadHandle != 0) { // listen thread was started // close thread -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) SdoUdpInstance_g.m_iTerminateThread = 1; /* kill_proc(SdoUdpInstance_g.m_ThreadHandle, SIGTERM, 1 ); */ send_sig(SIGTERM, SdoUdpInstance_g.m_ThreadHandle, 1); wait_for_completion(&SdoUdpInstance_g.m_CompletionUdpThread); -#endif - SdoUdpInstance_g.m_ThreadHandle = 0; } @@ -307,14 +294,11 @@ tEplKernel EplSdoUdpuConfig(unsigned lon if (SdoUdpInstance_g.m_ThreadHandle != 0) { // listen thread was started // close old thread -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) SdoUdpInstance_g.m_iTerminateThread = 1; /* kill_proc(SdoUdpInstance_g.m_ThreadHandle, SIGTERM, 1 ); */ send_sig(SIGTERM, SdoUdpInstance_g.m_ThreadHandle, 1); wait_for_completion(&SdoUdpInstance_g.m_CompletionUdpThread); SdoUdpInstance_g.m_iTerminateThread = 0; -#endif - SdoUdpInstance_g.m_ThreadHandle = 0; } @@ -349,15 +333,12 @@ tEplKernel EplSdoUdpuConfig(unsigned lon goto Exit; } // create Listen-Thread -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) - SdoUdpInstance_g.m_ThreadHandle = kernel_thread(EplSdoUdpThread, &SdoUdpInstance_g, CLONE_KERNEL); if (SdoUdpInstance_g.m_ThreadHandle == 0) { Ret = kEplSdoUdpThreadError; goto Exit; } -#endif Exit: return Ret; @@ -573,13 +554,11 @@ static int EplSdoUdpThread(void *pArg_p) unsigned int uiSize; tEplSdoConHdl SdoConHdl; -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) pInstance = (tEplSdoUdpInstance *) pArg_p; daemonize("EplSdoUdpThread"); allow_signal(SIGTERM); for (; pInstance->m_iTerminateThread == 0;) -#endif { // wait for data @@ -590,11 +569,9 @@ static int EplSdoUdpThread(void *pArg_p) 0, // flags (struct sockaddr *)&RemoteAddr, (int *)&uiSize); -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) if (iError == -ERESTARTSYS) { break; } -#endif if (iError > 0) { // get handle for higher layer iCount = 0; @@ -663,10 +640,7 @@ static int EplSdoUdpThread(void *pArg_p) } // end of if(iError!=SOCKET_ERROR) } // end of for(;;) -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) complete_and_exit(&SdoUdpInstance_g.m_CompletionUdpThread, 0); -#endif - return 0; } --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -83,18 +83,12 @@ // applications needs to use one common library function (e.g. memcpy()). So // you can set (or change) it here. -#ifndef __KERNEL__ -#include -#include -#else -// #include #include #include #include #include #include #include -#endif //29.11.2004 f.j. sonst ist memcpy und memset unbekannt // #include @@ -102,13 +96,8 @@ #define EPL_MEMCPY(dst,src,siz) memcpy((void*)(dst),(const void*)(src),(size_t)(siz)); #define EPL_MEMSET(dst,val,siz) memset((void*)(dst),(int)(val),(size_t)(siz)); -#ifndef __KERNEL__ -#define EPL_MALLOC(siz) malloc((size_t)(siz)) -#define EPL_FREE(ptr) free((void *)ptr) -#else #define EPL_MALLOC(siz) kmalloc((size_t)(siz), GFP_KERNEL) #define EPL_FREE(ptr) kfree((void *)ptr) -#endif #ifndef PRINTF0 #define PRINTF TRACE --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -288,15 +288,8 @@ typedef struct { //--------------------------------------------------------------------------- #ifndef ASSERT -#if !defined (__linux__) && !defined (__KERNEL__) -#include -#ifndef ASSERT -#define ASSERT(p) assert(p) -#endif -#else #define ASSERT(p) #endif -#endif //--------------------------------------------------------------------------- // SYS TEC extensions --- a/drivers/staging/epl/SharedBuff.c +++ b/drivers/staging/epl/SharedBuff.c @@ -85,15 +85,8 @@ #include "SharedBuff.h" #include "ShbIpc.h" -// d.k. Linux kernel modules needs other header files for memcpy() -#if (TARGET_SYSTEM == _LINUX_) && defined(__KERNEL__) #include #include -#else -#include -#include -#include -#endif /***************************************************************************/ /* */