Commit 01f5e032 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: epl: clean up demo_main.c

Fix some static symbols and drop the kernel version checks.

Also comment out the init and exit functions, as they don't get used
anymore.

Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 85df0b85
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,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>
...@@ -87,16 +86,6 @@ ...@@ -87,16 +86,6 @@
#include "Epl.h" #include "Epl.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
/***************************************************************************/ /***************************************************************************/
/* */ /* */
/* */ /* */
...@@ -148,25 +137,25 @@ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); ...@@ -148,25 +137,25 @@ void TgtDbgSignalTracePoint(u8 bTracePointNumber_p);
// modul globale vars // modul globale vars
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
const u8 abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const u8 abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
u8 bVarIn1_l; static u8 bVarIn1_l;
u8 bVarOut1_l; static u8 bVarOut1_l;
u8 bVarOut1Old_l; static u8 bVarOut1Old_l;
u8 bModeSelect_l; // state of the pushbuttons to select the mode static u8 bModeSelect_l; // state of the pushbuttons to select the mode
u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed static u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed
u8 bSpeedSelectOld_l; // old state of the pushbuttons static u8 bSpeedSelectOld_l; // old state of the pushbuttons
u32 dwLeds_l; // current state of all LEDs static u32 dwLeds_l; // current state of all LEDs
u8 bLedsRow1_l; // current state of the LEDs in row 1 static u8 bLedsRow1_l; // current state of the LEDs in row 1
u8 bLedsRow2_l; // current state of the LEDs in row 2 static u8 bLedsRow2_l; // current state of the LEDs in row 2
u8 abSelect_l[3]; // pushbuttons from CNs static u8 abSelect_l[3]; // pushbuttons from CNs
u32 dwMode_l; // current mode static u32 dwMode_l; // current mode
int iCurCycleCount_l; // current cycle count static int iCurCycleCount_l; // current cycle count
int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step) static int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step)
int iToggle; // indicates the light movement direction static int iToggle; // indicates the light movement direction
u8 abDomain_l[3000]; //static u8 abDomain_l[3000];
static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff static wait_queue_head_t WaitQueueShutdown_g; // wait queue for tEplNmtEventSwitchOff
static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE); static atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE);
...@@ -196,15 +185,11 @@ tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) ...@@ -196,15 +185,11 @@ tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum)
tEplKernel AppCbSync(void); tEplKernel AppCbSync(void);
static int __init EplLinInit(void);
static void __exit EplLinExit(void);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// 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);
...@@ -231,6 +216,7 @@ EXPORT_NO_SYMBOLS; ...@@ -231,6 +216,7 @@ EXPORT_NO_SYMBOLS;
// State: // State:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#if 0
static int __init EplLinInit(void) static int __init EplLinInit(void)
{ {
tEplKernel EplRet; tEplKernel EplRet;
...@@ -456,7 +442,7 @@ static void __exit EplLinExit(void) ...@@ -456,7 +442,7 @@ static void __exit EplLinExit(void)
printk("EplLinProcFree(): 0x%X\n", EplRet); printk("EplLinProcFree(): 0x%X\n", EplRet);
} }
#endif
//=========================================================================// //=========================================================================//
// // // //
// P R I V A T E F U N C T I O N S // // P R I V A T E F U N C T I O N S //
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment