tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Staging: epl: fix up epl/kernel/*.h files

Only include a file if it's needed.

Also remove some unused comments from the boilerplate text.

And delete some empty .h files

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>

Greg Kroah-Hartman 70e2db22 046f45fa

+5 -319
-2
drivers/staging/epl/EplNmtkCal.c
··· 69 69 70 70 ****************************************************************************/ 71 71 72 - #include "kernel/EplNmtkCal.h" 73 - 74 72 // TODO: init function needed to prepare EplNmtkGetNmtState for 75 73 // io-controll-call from EplNmtuCal-Modul 76 74
-1
drivers/staging/epl/EplObdkCal.c
··· 70 70 ****************************************************************************/ 71 71 72 72 #include "EplInc.h" 73 - #include "kernel/EplObdkCal.h" 74 73 75 74 /***************************************************************************/ 76 75 /* */
-12
drivers/staging/epl/kernel/EplDllk.h
··· 74 74 #include "../EplDll.h" 75 75 #include "../EplEvent.h" 76 76 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 77 typedef tEplKernel(*tEplDllkCbAsync) (tEplFrameInfo * pFrameInfo_p); 86 78 87 79 typedef struct { ··· 99 107 }; 100 108 101 109 typedef struct _tEplDllkNodeInfo tEplDllkNodeInfo; 102 - 103 - //--------------------------------------------------------------------------- 104 - // function prototypes 105 - //--------------------------------------------------------------------------- 106 110 107 111 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) != 0) 108 112
-12
drivers/staging/epl/kernel/EplDllkCal.h
··· 74 74 #include "../EplDll.h" 75 75 #include "../EplEvent.h" 76 76 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 77 typedef struct { 86 78 unsigned long m_ulCurTxFrameCountGen; 87 79 unsigned long m_ulCurTxFrameCountNmt; ··· 83 91 unsigned long m_ulMaxRxFrameCount; 84 92 85 93 } tEplDllkCalStatistics; 86 - 87 - //--------------------------------------------------------------------------- 88 - // function prototypes 89 - //--------------------------------------------------------------------------- 90 94 91 95 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLK)) != 0) 92 96
-12
drivers/staging/epl/kernel/EplErrorHandlerk.h
··· 73 73 74 74 #include "../EplEvent.h" 75 75 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // function prototypes 86 - //--------------------------------------------------------------------------- 87 - 88 76 // init function 89 77 tEplKernel EplErrorHandlerkInit(void); 90 78
-12
drivers/staging/epl/kernel/EplEventk.h
··· 73 73 74 74 #include "../EplEvent.h" 75 75 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // function prototypes 86 - //--------------------------------------------------------------------------- 87 - 88 76 // init function 89 77 tEplKernel EplEventkInit(tEplSyncCb fpSyncCb); 90 78
-11
drivers/staging/epl/kernel/EplNmtk.h
··· 74 74 #include "../EplNmt.h" 75 75 #include "EplEventk.h" 76 76 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 - //--------------------------------------------------------------------------- 86 - // function prototypes 87 - //--------------------------------------------------------------------------- 88 77 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTK)) != 0) 89 78 tEplKernel EplNmtkInit(EPL_MCO_DECL_PTR_INSTANCE_PTR); 90 79
-89
drivers/staging/epl/kernel/EplNmtkCal.h
··· 1 - /**************************************************************************** 2 - 3 - (c) SYSTEC electronic GmbH, D-07973 Greiz, August-Bebel-Str. 29 4 - www.systec-electronic.com 5 - 6 - Project: openPOWERLINK 7 - 8 - Description: include file for communication abstraction layer of the 9 - NMT-Kernel-Module 10 - 11 - License: 12 - 13 - Redistribution and use in source and binary forms, with or without 14 - modification, are permitted provided that the following conditions 15 - are met: 16 - 17 - 1. Redistributions of source code must retain the above copyright 18 - notice, this list of conditions and the following disclaimer. 19 - 20 - 2. Redistributions in binary form must reproduce the above copyright 21 - notice, this list of conditions and the following disclaimer in the 22 - documentation and/or other materials provided with the distribution. 23 - 24 - 3. Neither the name of SYSTEC electronic GmbH nor the names of its 25 - contributors may be used to endorse or promote products derived 26 - from this software without prior written permission. For written 27 - permission, please contact info@systec-electronic.com. 28 - 29 - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 30 - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 31 - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 32 - FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 33 - COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 34 - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 35 - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 36 - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 37 - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 38 - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 39 - ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 40 - POSSIBILITY OF SUCH DAMAGE. 41 - 42 - Severability Clause: 43 - 44 - If a provision of this License is or becomes illegal, invalid or 45 - unenforceable in any jurisdiction, that shall not affect: 46 - 1. the validity or enforceability in that jurisdiction of any other 47 - provision of this License; or 48 - 2. the validity or enforceability in other jurisdictions of that or 49 - any other provision of this License. 50 - 51 - ------------------------------------------------------------------------- 52 - 53 - $RCSfile: EplNmtkCal.h,v $ 54 - 55 - $Author: D.Krueger $ 56 - 57 - $Revision: 1.3 $ $Date: 2008/04/17 21:36:32 $ 58 - 59 - $State: Exp $ 60 - 61 - Build Environment: 62 - KEIL uVision 2 63 - 64 - ------------------------------------------------------------------------- 65 - 66 - Revision History: 67 - 68 - 2006/06/16 -k.t.: start of the implementation 69 - 70 - ****************************************************************************/ 71 - 72 - #include "EplNmtk.h" 73 - 74 - #ifndef _EPLNMTKCAL_H_ 75 - #define _EPLNMTKCAL_H_ 76 - 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 - //--------------------------------------------------------------------------- 86 - // function prototypes 87 - //--------------------------------------------------------------------------- 88 - 89 - #endif // #ifndef _EPLNMTKCAL_H_
+1 -16
drivers/staging/epl/kernel/EplObdk.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplObd.h" 72 - 73 71 #ifndef _EPLOBDK_H_ 74 72 #define _EPLOBDK_H_ 75 73 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // global variables 86 - //--------------------------------------------------------------------------- 74 + #include "../EplObd.h" 87 75 88 76 extern u8 abEplObdTrashObject_g[8]; 89 77 90 - //--------------------------------------------------------------------------- 91 - // function prototypes 92 - //--------------------------------------------------------------------------- 93 78 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDK)) != 0) 94 79 // --------------------------------------------------------------------- 95 80 tEplKernel EplObdInit(EPL_MCO_DECL_PTR_INSTANCE_PTR_ tEplObdInitParam *pInitParam_p);
-89
drivers/staging/epl/kernel/EplObdkCal.h
··· 1 - /**************************************************************************** 2 - 3 - (c) SYSTEC electronic GmbH, D-07973 Greiz, August-Bebel-Str. 29 4 - www.systec-electronic.com 5 - 6 - Project: openPOWERLINK 7 - 8 - Description: include file for communication abstraction layer 9 - for the Epl-Obd-Kernelspace-Modul 10 - 11 - License: 12 - 13 - Redistribution and use in source and binary forms, with or without 14 - modification, are permitted provided that the following conditions 15 - are met: 16 - 17 - 1. Redistributions of source code must retain the above copyright 18 - notice, this list of conditions and the following disclaimer. 19 - 20 - 2. Redistributions in binary form must reproduce the above copyright 21 - notice, this list of conditions and the following disclaimer in the 22 - documentation and/or other materials provided with the distribution. 23 - 24 - 3. Neither the name of SYSTEC electronic GmbH nor the names of its 25 - contributors may be used to endorse or promote products derived 26 - from this software without prior written permission. For written 27 - permission, please contact info@systec-electronic.com. 28 - 29 - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 30 - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 31 - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 32 - FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 33 - COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 34 - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 35 - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 36 - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 37 - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 38 - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 39 - ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 40 - POSSIBILITY OF SUCH DAMAGE. 41 - 42 - Severability Clause: 43 - 44 - If a provision of this License is or becomes illegal, invalid or 45 - unenforceable in any jurisdiction, that shall not affect: 46 - 1. the validity or enforceability in that jurisdiction of any other 47 - provision of this License; or 48 - 2. the validity or enforceability in other jurisdictions of that or 49 - any other provision of this License. 50 - 51 - ------------------------------------------------------------------------- 52 - 53 - $RCSfile: EplObdkCal.h,v $ 54 - 55 - $Author: D.Krueger $ 56 - 57 - $Revision: 1.4 $ $Date: 2008/04/17 21:36:32 $ 58 - 59 - $State: Exp $ 60 - 61 - Build Environment: 62 - GCC V3.4 63 - 64 - ------------------------------------------------------------------------- 65 - 66 - Revision History: 67 - 68 - 2006/06/19 k.t.: start of the implementation 69 - 70 - ****************************************************************************/ 71 - 72 - #include "../EplObd.h" 73 - 74 - #ifndef _EPLOBDKCAL_H_ 75 - #define _EPLOBDKCAL_H_ 76 - 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 - //--------------------------------------------------------------------------- 86 - // function prototypes 87 - //--------------------------------------------------------------------------- 88 - 89 - #endif // #ifndef _EPLOBDKCAL_H_
-12
drivers/staging/epl/kernel/EplPdok.h
··· 75 75 #include "../EplEvent.h" 76 76 #include "../EplDll.h" 77 77 78 - //--------------------------------------------------------------------------- 79 - // const defines 80 - //--------------------------------------------------------------------------- 81 - 82 - //--------------------------------------------------------------------------- 83 - // typedef 84 - //--------------------------------------------------------------------------- 85 - 86 - //--------------------------------------------------------------------------- 87 - // function prototypes 88 - //--------------------------------------------------------------------------- 89 - 90 78 // process events from queue (PDOs/frames and SoA for synchronization) 91 79 tEplKernel EplPdokProcess(tEplEvent * pEvent_p); 92 80
-13
drivers/staging/epl/kernel/EplPdokCal.h
··· 72 72 #define _EPL_PDOKCAL_H_ 73 73 74 74 #include "../EplInc.h" 75 - //#include "EplPdo.h" 76 - 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 - //--------------------------------------------------------------------------- 86 - // function prototypes 87 - //--------------------------------------------------------------------------- 88 75 89 76 tEplKernel EplPdokCalAddInstance(void); 90 77
+1 -13
drivers/staging/epl/kernel/EplTimerHighResk.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplTimer.h" 72 - 73 71 #ifndef _EPLTIMERHIGHRESK_H_ 74 72 #define _EPLTIMERHIGHRESK_H_ 75 73 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // function prototypes 86 - //--------------------------------------------------------------------------- 74 + #include "../EplTimer.h" 87 75 88 76 tEplKernel EplTimerHighReskInit(void); 89 77
+3 -13
drivers/staging/epl/kernel/EplTimerk.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplTimer.h" 72 - #include "../user/EplEventu.h" 73 - 74 71 #ifndef _EPLTIMERK_H_ 75 72 #define _EPLTIMERK_H_ 73 + 74 + #include "../EplTimer.h" 75 + #include "../user/EplEventu.h" 76 76 77 77 #if EPL_TIMER_USE_USER != FALSE 78 78 #include "../user/EplTimeru.h" 79 79 #endif 80 80 81 - //--------------------------------------------------------------------------- 82 - // const defines 83 - //--------------------------------------------------------------------------- 84 81 85 82 #if EPL_TIMER_USE_USER != FALSE 86 83 #define EplTimerkInit EplTimeruInit ··· 88 91 #define EplTimerkDeleteTimer EplTimeruDeleteTimer 89 92 #endif 90 93 91 - //--------------------------------------------------------------------------- 92 - // typedef 93 - //--------------------------------------------------------------------------- 94 - 95 - //--------------------------------------------------------------------------- 96 - // function prototypes 97 - //--------------------------------------------------------------------------- 98 94 #if EPL_TIMER_USE_USER == FALSE 99 95 tEplKernel EplTimerkInit(void); 100 96
-12
drivers/staging/epl/kernel/VirtualEthernet.h
··· 73 73 74 74 #include "EplDllk.h" 75 75 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // function prototypes 86 - //--------------------------------------------------------------------------- 87 - 88 76 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) 89 77 90 78 tEplKernel VEthAddInstance(tEplDllkInitParam *pInitParam_p);