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

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

Only include a file if it's needed.

Also remove some unused comments from the boilerplate text.

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>

+28 -242
+2 -9
drivers/staging/epl/user/EplCfgMau.h
··· 69 69 70 70 ****************************************************************************/ 71 71 72 - #include "../EplInc.h" 73 - 74 72 #ifndef _EPLCFGMA_H_ 75 73 #define _EPLCFGMA_H_ 74 + 75 + #include "../EplInc.h" 76 76 77 77 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_CFGMA)) != 0) 78 78 79 79 #include "EplObdu.h" 80 80 #include "EplSdoComu.h" 81 81 82 - //--------------------------------------------------------------------------- 83 - // typedef 84 - //--------------------------------------------------------------------------- 85 82 //define max number of timeouts for configuration of 1 device 86 83 #define EPL_CFGMA_MAX_TIMEOUT 3 87 84 ··· 149 152 // m_wTimeOutCnt == CFGMA_MAX_TIMEOUT 150 153 151 154 } tEplCfgMaNode; 152 - 153 - //--------------------------------------------------------------------------- 154 - // function prototypes 155 - //--------------------------------------------------------------------------- 156 155 157 156 //--------------------------------------------------------------------------- 158 157 // Function: EplCfgMaInit()
-12
drivers/staging/epl/user/EplDllu.h
··· 73 73 74 74 #include "../EplDll.h" 75 75 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 76 typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); 85 - 86 - //--------------------------------------------------------------------------- 87 - // function prototypes 88 - //--------------------------------------------------------------------------- 89 77 90 78 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_DLLU)) != 0) 91 79
-11
drivers/staging/epl/user/EplDlluCal.h
··· 74 74 #include "../EplDll.h" 75 75 #include "../EplEvent.h" 76 76 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 77 85 78 typedef tEplKernel(* tEplDlluCbAsnd) (tEplFrameInfo * pFrameInfo_p); 86 - 87 - //--------------------------------------------------------------------------- 88 - // function prototypes 89 - //--------------------------------------------------------------------------- 90 79 91 80 tEplKernel EplDlluCalAddInstance(void); 92 81
-11
drivers/staging/epl/user/EplEventu.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 76 // init function 88 77 tEplKernel EplEventuInit(tEplProcessEventCb pfnApiProcessEventCb_p); 89 78
+1 -13
drivers/staging/epl/user/EplIdentu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplDll.h" 72 - 73 71 #ifndef _EPLIDENTU_H_ 74 72 #define _EPLIDENTU_H_ 75 73 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 74 + #include "../EplDll.h" 83 75 84 76 typedef tEplKernel(* tEplIdentuCbResponse) (unsigned int uiNodeId_p, 85 77 tEplIdentResponse * 86 78 pIdentResponse_p); 87 - 88 - //--------------------------------------------------------------------------- 89 - // function prototypes 90 - //--------------------------------------------------------------------------- 91 79 92 80 tEplKernel EplIdentuInit(void); 93 81
+3 -15
drivers/staging/epl/user/EplLedu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 + #ifndef _EPLLEDU_H_ 72 + #define _EPLLEDU_H_ 73 + 71 74 #include "../EplLed.h" 72 75 #include "../EplNmt.h" 73 76 #include "EplEventu.h" 74 77 75 - #ifndef _EPLLEDU_H_ 76 - #define _EPLLEDU_H_ 77 - 78 - //--------------------------------------------------------------------------- 79 - // const defines 80 - //--------------------------------------------------------------------------- 81 - 82 - //--------------------------------------------------------------------------- 83 - // typedef 84 - //--------------------------------------------------------------------------- 85 - 86 78 typedef tEplKernel(* tEplLeduStateChangeCallback) (tEplLedType LedType_p, 87 79 BOOL fOn_p); 88 - 89 - //--------------------------------------------------------------------------- 90 - // function prototypes 91 - //--------------------------------------------------------------------------- 92 80 93 81 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_LEDU)) != 0) 94 82
+3 -15
drivers/staging/epl/user/EplNmtCnu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "EplNmtu.h" 72 - #include "../EplDll.h" 73 - #include "../EplFrame.h" 74 - 75 71 #ifndef _EPLNMTCNU_H_ 76 72 #define _EPLNMTCNU_H_ 77 73 78 - //--------------------------------------------------------------------------- 79 - // const defines 80 - //--------------------------------------------------------------------------- 81 - 82 - //--------------------------------------------------------------------------- 83 - // typedef 84 - //--------------------------------------------------------------------------- 85 - 86 - //--------------------------------------------------------------------------- 87 - // function prototypes 88 - //--------------------------------------------------------------------------- 74 + #include "EplNmtu.h" 75 + #include "../EplDll.h" 76 + #include "../EplFrame.h" 89 77 90 78 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_CN)) != 0) 91 79
+1 -13
drivers/staging/epl/user/EplNmtMnu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "EplNmtu.h" 72 - 73 71 #ifndef _EPLNMTMNU_H_ 74 72 #define _EPLNMTMNU_H_ 75 73 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 74 + #include "EplNmtu.h" 83 75 84 76 typedef tEplKernel(* tEplNmtMnuCbNodeEvent) (unsigned int uiNodeId_p, 85 77 tEplNmtNodeEvent NodeEvent_p, ··· 82 90 typedef tEplKernel(* tEplNmtMnuCbBootEvent) (tEplNmtBootEvent BootEvent_p, 83 91 tEplNmtState NmtState_p, 84 92 u16 wErrorCode_p); 85 - 86 - //--------------------------------------------------------------------------- 87 - // function prototypes 88 - //--------------------------------------------------------------------------- 89 93 90 94 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMT_MN)) != 0) 91 95
+2 -13
drivers/staging/epl/user/EplNmtu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplNmt.h" 72 - #include "EplEventu.h" 73 - 74 71 #ifndef _EPLNMTU_H_ 75 72 #define _EPLNMTU_H_ 76 73 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 74 + #include "../EplNmt.h" 75 + #include "EplEventu.h" 80 76 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 77 // nmt commands 85 78 typedef enum { 86 79 // requestable ASnd ServiceIds 0x01..0x1F ··· 117 124 typedef tEplKernel(* tEplNmtuStateChangeCallback) (tEplEventNmtStateChange NmtStateChange_p); 118 125 119 126 typedef tEplKernel(* tEplNmtuCheckEventCallback) (tEplNmtEvent NmtEvent_p); 120 - 121 - //--------------------------------------------------------------------------- 122 - // function prototypes 123 - //--------------------------------------------------------------------------- 124 127 125 128 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_NMTU)) != 0) 126 129
+2 -13
drivers/staging/epl/user/EplNmtuCal.h
··· 69 69 70 70 ****************************************************************************/ 71 71 72 - #include "EplNmtu.h" 73 - #include "../kernel/EplNmtk.h" 74 - 75 72 #ifndef _EPLNMTUCAL_H_ 76 73 #define _EPLNMTUCAL_H_ 77 74 78 - //--------------------------------------------------------------------------- 79 - // const defines 80 - //--------------------------------------------------------------------------- 75 + #include "EplNmtu.h" 76 + #include "../kernel/EplNmtk.h" 81 77 82 - //--------------------------------------------------------------------------- 83 - // typedef 84 - //--------------------------------------------------------------------------- 85 - 86 - //--------------------------------------------------------------------------- 87 - // function prototypes 88 - //--------------------------------------------------------------------------- 89 78 tEplNmtState EplNmtkCalGetNmtState(void); 90 79 91 80 #endif // #ifndef _EPLNMTUCAL_H_
+1 -13
drivers/staging/epl/user/EplObdu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplObd.h" 72 - 73 71 #ifndef _EPLOBDU_H_ 74 72 #define _EPLOBDU_H_ 75 73 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // function prototypes 86 - //--------------------------------------------------------------------------- 74 + #include "../EplObd.h" 87 75 88 76 #if (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_OBDU)) != 0) 89 77
+1 -12
drivers/staging/epl/user/EplObduCal.h
··· 69 69 70 70 ****************************************************************************/ 71 71 72 - #include "../EplObd.h" 73 - 74 72 #ifndef _EPLOBDUCAL_H_ 75 73 #define _EPLOBDUCAL_H_ 76 74 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 75 + #include "../EplObd.h" 80 76 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 - //--------------------------------------------------------------------------- 86 - // function prototypes 87 - //--------------------------------------------------------------------------- 88 77 tEplKernel EplObduCalWriteEntry(unsigned int uiIndex_p, 89 78 unsigned int uiSubIndex_p, 90 79 void *pSrcData_p,
-12
drivers/staging/epl/user/EplPdou.h
··· 72 72 73 73 #include "../EplPdo.h" 74 74 75 - //--------------------------------------------------------------------------- 76 - // const defines 77 - //--------------------------------------------------------------------------- 78 - 79 - //--------------------------------------------------------------------------- 80 - // typedef 81 - //--------------------------------------------------------------------------- 82 - 83 - //--------------------------------------------------------------------------- 84 - // function prototypes 85 - //--------------------------------------------------------------------------- 86 - 87 75 tEplKernel EplPdouAddInstance(void); 88 76 89 77 tEplKernel EplPdouDelInstance(void);
+2 -13
drivers/staging/epl/user/EplSdoAsndu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplSdo.h" 72 - #include "../EplDll.h" 73 - 74 71 #ifndef _EPLSDOASNDU_H_ 75 72 #define _EPLSDOASNDU_H_ 76 73 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 74 + #include "../EplSdo.h" 75 + #include "../EplDll.h" 80 76 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 - //--------------------------------------------------------------------------- 86 - // function prototypes 87 - //--------------------------------------------------------------------------- 88 77 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_ASND)) != 0) 89 78 90 79 tEplKernel EplSdoAsnduInit(tEplSequLayerReceiveCb fpReceiveCb_p);
+3 -14
drivers/staging/epl/user/EplSdoAsySequ.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 + #ifndef _EPLSDOASYSEQU_H_ 72 + #define _EPLSDOASYSEQU_H_ 73 + 71 74 #include "../EplSdo.h" 72 75 #include "EplSdoUdpu.h" 73 76 #include "EplSdoAsndu.h" 74 77 #include "../EplEvent.h" 75 78 #include "EplTimeru.h" 76 79 77 - #ifndef _EPLSDOASYSEQU_H_ 78 - #define _EPLSDOASYSEQU_H_ 79 - 80 - //--------------------------------------------------------------------------- 81 - // const defines 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // typedef 86 - //--------------------------------------------------------------------------- 87 - 88 - //--------------------------------------------------------------------------- 89 - // function prototypes 90 - //--------------------------------------------------------------------------- 91 80 tEplKernel EplSdoAsySeqInit(tEplSdoComReceiveCb fpSdoComCb_p, 92 81 tEplSdoComConCb fpSdoComConCb_p); 93 82
+3 -14
drivers/staging/epl/user/EplSdoComu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 + #ifndef _EPLSDOCOMU_H_ 72 + #define _EPLSDOCOMU_H_ 73 + 71 74 #include "../EplSdo.h" 72 75 #include "../EplObd.h" 73 76 #include "../EplSdoAc.h" 74 77 #include "EplObdu.h" 75 78 #include "EplSdoAsySequ.h" 76 79 77 - #ifndef _EPLSDOCOMU_H_ 78 - #define _EPLSDOCOMU_H_ 79 - 80 - //--------------------------------------------------------------------------- 81 - // const defines 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // typedef 86 - //--------------------------------------------------------------------------- 87 - 88 - //--------------------------------------------------------------------------- 89 - // function prototypes 90 - //--------------------------------------------------------------------------- 91 80 tEplKernel EplSdoComInit(void); 92 81 93 82 tEplKernel EplSdoComAddInstance(void);
+1 -12
drivers/staging/epl/user/EplSdoUdpu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplSdo.h" 72 - 73 71 #ifndef _EPLSDOUDPU_H_ 74 72 #define _EPLSDOUDPU_H_ 75 73 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 74 + #include "../EplSdo.h" 79 75 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 83 - 84 - //--------------------------------------------------------------------------- 85 - // function prototypes 86 - //--------------------------------------------------------------------------- 87 76 #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_SDO_UDP)) != 0) 88 77 89 78 tEplKernel EplSdoUdpuInit(tEplSequLayerReceiveCb fpReceiveCb_p);
+1 -13
drivers/staging/epl/user/EplStatusu.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplDll.h" 72 - 73 71 #ifndef _EPLSTATUSU_H_ 74 72 #define _EPLSTATUSU_H_ 75 73 76 - //--------------------------------------------------------------------------- 77 - // const defines 78 - //--------------------------------------------------------------------------- 79 - 80 - //--------------------------------------------------------------------------- 81 - // typedef 82 - //--------------------------------------------------------------------------- 74 + #include "../EplDll.h" 83 75 84 76 typedef tEplKernel(* tEplStatusuCbResponse) (unsigned int uiNodeId_p, 85 77 tEplStatusResponse *pStatusResponse_p); 86 - 87 - //--------------------------------------------------------------------------- 88 - // function prototypes 89 - //--------------------------------------------------------------------------- 90 78 91 79 tEplKernel EplStatusuInit(void); 92 80
+2 -14
drivers/staging/epl/user/EplTimeru.h
··· 68 68 69 69 ****************************************************************************/ 70 70 71 - #include "../EplTimer.h" 72 - #include "EplEventu.h" 73 - 74 71 #ifndef _EPLTIMERU_H_ 75 72 #define _EPLTIMERU_H_ 76 73 77 - //--------------------------------------------------------------------------- 78 - // const defines 79 - //--------------------------------------------------------------------------- 80 - 81 - //--------------------------------------------------------------------------- 82 - // typedef 83 - //--------------------------------------------------------------------------- 84 - 85 - //--------------------------------------------------------------------------- 86 - // function prototypes 87 - //--------------------------------------------------------------------------- 74 + #include "../EplTimer.h" 75 + #include "EplEventu.h" 88 76 89 77 tEplKernel EplTimeruInit(void); 90 78