diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-23 11:19:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:20 -0700 |
| commit | 541a8bde90068471e9fc26cfe4c5fcb11dcd751b (patch) | |
| tree | f7fc80526318ad4c36239e878e62ea0db3ef7151 /drivers/staging/epl/EplApiProcessImage.c | |
| parent | 563b125de36c91722f038f11da374d49de168917 (diff) | |
Staging: epl: remove __KERNEL__ checks
We are in the kernel, so these checks are pointless.
Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/epl/EplApiProcessImage.c')
| -rw-r--r-- | drivers/staging/epl/EplApiProcessImage.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/staging/epl/EplApiProcessImage.c b/drivers/staging/epl/EplApiProcessImage.c index 4fbb7289e0bf..869d97a4bd1c 100644 --- 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 <asm/uaccess.h> -#endif +#include <linux/uaccess.h> /***************************************************************************/ /* */ @@ -285,19 +282,11 @@ tEplKernel EplApiProcessImageExchangeIn(tEplApiProcessImage *pPI_p) 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(tEplApiProcessImage *pPI_p) 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; |