From b3491294994bf9d2b86d400132416ac95ef6b33a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 13:07:51 -0700 Subject: [PATCH] Staging: epl: remove kernel version checks They are no longer needed now that we are in the kernel. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Edrv8139.c | 6 ------ drivers/staging/epl/EplApiLinuxKernel.c | 18 ------------------ drivers/staging/epl/EplTarget.h | 1 - drivers/staging/epl/VirtualEthernetLinux.c | 1 - drivers/staging/epl/proc_fs.c | 1 - 5 files changed, 27 deletions(-) diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c index c0709a5836f7..44e3f7b144bc 100644 --- a/drivers/staging/epl/Edrv8139.c +++ b/drivers/staging/epl/Edrv8139.c @@ -81,7 +81,6 @@ #include #include #include -#include #include #include #include @@ -751,12 +750,7 @@ void EdrvInterruptHandler(void) } #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p) -#else -static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p, - struct pt_regs *ptRegs_p) -#endif { // EdrvInterruptHandler(); tEdrvRxBuffer RxBuffer; diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c index a994b16d8492..5a2d066e60ec 100644 --- a/drivers/staging/epl/EplApiLinuxKernel.c +++ b/drivers/staging/epl/EplApiLinuxKernel.c @@ -72,9 +72,6 @@ // kernel modul and driver -//#include -//#include - #include #include #include @@ -102,15 +99,6 @@ //#include "kernel/EplPdokCal.h" #include "proc_fs.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - // remove ("make invisible") obsolete symbols for kernel versions 2.6 - // and higher -#define MOD_INC_USE_COUNT -#define MOD_DEC_USE_COUNT -#define EXPORT_NO_SYMBOLS -#else -#error "This driver needs a 2.6.x kernel or higher" -#endif /***************************************************************************/ /* */ @@ -226,8 +214,6 @@ static int EplLinIoctl(struct inode *pDeviceFile_p, struct file *pInstance_p, // Kernel Module specific Data Structures //--------------------------------------------------------------------------- -EXPORT_NO_SYMBOLS; - module_init(EplLinInit); module_exit(EplLinExit); @@ -416,8 +402,6 @@ static int EplLinOpen(struct inode *pDeviceFile_p, // information about the devi TRACE0("EPL: + EplLinOpen...\n"); - MOD_INC_USE_COUNT; - if (uiEplState_g != EPL_STATE_NOTOPEN) { // stack already initialized iRet = -EALREADY; } else { @@ -490,8 +474,6 @@ static int EplLinRelease(struct inode *pDeviceFile_p, // information about the d uiEplState_g = EPL_STATE_NOTOPEN; iRet = 0; - MOD_DEC_USE_COUNT; - TRACE1("EPL: - EplLinRelease (iRet=%d)\n", iRet); return (iRet); diff --git a/drivers/staging/epl/EplTarget.h b/drivers/staging/epl/EplTarget.h index beacd89c3d68..e76d21ff9d99 100644 --- a/drivers/staging/epl/EplTarget.h +++ b/drivers/staging/epl/EplTarget.h @@ -88,7 +88,6 @@ #include #include #include -#include //29.11.2004 f.j. sonst ist memcpy und memset unbekannt // #include diff --git a/drivers/staging/epl/VirtualEthernetLinux.c b/drivers/staging/epl/VirtualEthernetLinux.c index 445b9e620c27..21206c4d22ff 100644 --- a/drivers/staging/epl/VirtualEthernetLinux.c +++ b/drivers/staging/epl/VirtualEthernetLinux.c @@ -74,7 +74,6 @@ ****************************************************************************/ -#include #include #include #include diff --git a/drivers/staging/epl/proc_fs.c b/drivers/staging/epl/proc_fs.c index e82ab0c0b569..739d3899353a 100644 --- a/drivers/staging/epl/proc_fs.c +++ b/drivers/staging/epl/proc_fs.c @@ -83,7 +83,6 @@ #include #include #include -#include #include #include #include -- 2.30.2