Staging: epl: remove kernel version checks
They are no longer needed now that we are in the kernel. 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>
This commit is contained in:
Родитель
01f5e0322d
Коммит
b349129499
|
@ -81,7 +81,6 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/major.h>
|
#include <linux/major.h>
|
||||||
#include <linux/version.h>
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
|
@ -751,12 +750,7 @@ void EdrvInterruptHandler(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
|
|
||||||
static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p)
|
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();
|
// EdrvInterruptHandler();
|
||||||
tEdrvRxBuffer RxBuffer;
|
tEdrvRxBuffer RxBuffer;
|
||||||
|
|
|
@ -72,9 +72,6 @@
|
||||||
|
|
||||||
// kernel modul and driver
|
// kernel modul and driver
|
||||||
|
|
||||||
//#include <linux/version.h>
|
|
||||||
//#include <linux/config.h>
|
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/cdev.h>
|
#include <linux/cdev.h>
|
||||||
|
@ -102,15 +99,6 @@
|
||||||
//#include "kernel/EplPdokCal.h"
|
//#include "kernel/EplPdokCal.h"
|
||||||
#include "proc_fs.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
|
// Kernel Module specific Data Structures
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
EXPORT_NO_SYMBOLS;
|
|
||||||
|
|
||||||
module_init(EplLinInit);
|
module_init(EplLinInit);
|
||||||
module_exit(EplLinExit);
|
module_exit(EplLinExit);
|
||||||
|
|
||||||
|
@ -416,8 +402,6 @@ static int EplLinOpen(struct inode *pDeviceFile_p, // information about the devi
|
||||||
|
|
||||||
TRACE0("EPL: + EplLinOpen...\n");
|
TRACE0("EPL: + EplLinOpen...\n");
|
||||||
|
|
||||||
MOD_INC_USE_COUNT;
|
|
||||||
|
|
||||||
if (uiEplState_g != EPL_STATE_NOTOPEN) { // stack already initialized
|
if (uiEplState_g != EPL_STATE_NOTOPEN) { // stack already initialized
|
||||||
iRet = -EALREADY;
|
iRet = -EALREADY;
|
||||||
} else {
|
} else {
|
||||||
|
@ -490,8 +474,6 @@ static int EplLinRelease(struct inode *pDeviceFile_p, // information about the d
|
||||||
uiEplState_g = EPL_STATE_NOTOPEN;
|
uiEplState_g = EPL_STATE_NOTOPEN;
|
||||||
iRet = 0;
|
iRet = 0;
|
||||||
|
|
||||||
MOD_DEC_USE_COUNT;
|
|
||||||
|
|
||||||
TRACE1("EPL: - EplLinRelease (iRet=%d)\n", iRet);
|
TRACE1("EPL: - EplLinRelease (iRet=%d)\n", iRet);
|
||||||
return (iRet);
|
return (iRet);
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,6 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/major.h>
|
#include <linux/major.h>
|
||||||
#include <linux/version.h>
|
|
||||||
|
|
||||||
//29.11.2004 f.j. sonst ist memcpy und memset unbekannt
|
//29.11.2004 f.j. sonst ist memcpy und memset unbekannt
|
||||||
// #include <string.h>
|
// #include <string.h>
|
||||||
|
|
|
@ -74,7 +74,6 @@
|
||||||
|
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <linux/version.h>
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
#include <linux/etherdevice.h>
|
#include <linux/etherdevice.h>
|
||||||
|
|
|
@ -83,7 +83,6 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/major.h>
|
#include <linux/major.h>
|
||||||
#include <linux/version.h>
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче