From 01f5e0322d5e04049f0b1fb5d747d088dec45241 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 13:05:08 -0700 Subject: [PATCH] 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 Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/demo_main.c | 50 ++++++++++++--------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 74ab74f80f94..7ad10fc2b1d0 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -74,7 +74,6 @@ #include #include #include -#include #include #include #include @@ -87,16 +86,6 @@ #include "Epl.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); // 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; -u8 bVarOut1_l; -u8 bVarOut1Old_l; -u8 bModeSelect_l; // state of the pushbuttons to select the mode -u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed -u8 bSpeedSelectOld_l; // old state of the pushbuttons -u32 dwLeds_l; // current state of all LEDs -u8 bLedsRow1_l; // current state of the LEDs in row 1 -u8 bLedsRow2_l; // current state of the LEDs in row 2 -u8 abSelect_l[3]; // pushbuttons from CNs +static u8 bVarIn1_l; +static u8 bVarOut1_l; +static u8 bVarOut1Old_l; +static u8 bModeSelect_l; // state of the pushbuttons to select the mode +static u8 bSpeedSelect_l; // state of the pushbuttons to increase/decrease the speed +static u8 bSpeedSelectOld_l; // old state of the pushbuttons +static u32 dwLeds_l; // current state of all LEDs +static u8 bLedsRow1_l; // current state of the LEDs in row 1 +static u8 bLedsRow2_l; // current state of the LEDs in row 2 +static u8 abSelect_l[3]; // pushbuttons from CNs -u32 dwMode_l; // current mode -int iCurCycleCount_l; // current cycle count -int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step) -int iToggle; // indicates the light movement direction +static u32 dwMode_l; // current mode +static int iCurCycleCount_l; // current cycle count +static int iMaxCycleCount_l; // maximum cycle count (i.e. number of cycles until next light movement step) +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 atomic_t AtomicShutdown_g = ATOMIC_INIT(FALSE); @@ -196,15 +185,11 @@ tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplKernel AppCbSync(void); -static int __init EplLinInit(void); -static void __exit EplLinExit(void); //--------------------------------------------------------------------------- // Kernel Module specific Data Structures //--------------------------------------------------------------------------- -EXPORT_NO_SYMBOLS; - //module_init(EplLinInit); //module_exit(EplLinExit); @@ -231,6 +216,7 @@ EXPORT_NO_SYMBOLS; // State: // //--------------------------------------------------------------------------- +#if 0 static int __init EplLinInit(void) { tEplKernel EplRet; @@ -456,7 +442,7 @@ static void __exit EplLinExit(void) printk("EplLinProcFree(): 0x%X\n", EplRet); } - +#endif //=========================================================================// // // // P R I V A T E F U N C T I O N S // -- 2.20.1