diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
commit | 3516c6a8dc0b1153c611c4cf0dc4a51631f052bb (patch) | |
tree | c54a5fc916cbe73e43dee20902642f367f44a551 /drivers/staging/epl/TimerHighReskX86.c | |
parent | 714f83d5d9f7c785f622259dad1f4fad12d64664 (diff) | |
parent | ba0e1ebb7ea0616eebc29d2077355bacea62a9d8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits)
Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
Staging: serqt_usb: fix build due to proc tty changes
Staging: serqt_usb: fix checkpatch errors
Staging: serqt_usb: add TODO file
Staging: serqt_usb: Lindent the code
Staging: add USB serial Quatech driver
staging: document that the wifi staging drivers a bit better
Staging: echo cleanup
Staging: BUG to BUG_ON changes
Staging: remove some pointless conditionals before kfree_skb()
Staging: line6: fix build error, select SND_RAWMIDI
Staging: line6: fix checkpatch errors in variax.c
Staging: line6: fix checkpatch errors in toneport.c
Staging: line6: fix checkpatch errors in pcm.c
Staging: line6: fix checkpatch errors in midibuf.c
Staging: line6: fix checkpatch errors in midi.c
Staging: line6: fix checkpatch errors in dumprequest.c
Staging: line6: fix checkpatch errors in driver.c
Staging: line6: fix checkpatch errors in audio.c
Staging: line6: fix checkpatch errors in pod.c
...
Diffstat (limited to 'drivers/staging/epl/TimerHighReskX86.c')
-rw-r--r-- | drivers/staging/epl/TimerHighReskX86.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/drivers/staging/epl/TimerHighReskX86.c b/drivers/staging/epl/TimerHighReskX86.c index 82eee4702aa..d6897de4f14 100644 --- a/drivers/staging/epl/TimerHighReskX86.c +++ b/drivers/staging/epl/TimerHighReskX86.c @@ -97,14 +97,10 @@ #define PROVE_OVERRUN -#ifndef CONFIG_HIGH_RES_TIMERS -#error "Kernel symbol CONFIG_HIGH_RES_TIMERS is required." -#endif - // TracePoint support for realtime-debugging #ifdef _DBG_TRACE_POINTS_ -void PUBLIC TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); -void PUBLIC TgtDbgPostTraceValue(DWORD dwTraceValue_p); +void TgtDbgSignalTracePoint(u8 bTracePointNumber_p); +void TgtDbgPostTraceValue(u32 dwTraceValue_p); #define TGT_DBG_SIGNAL_TRACE_POINT(p) TgtDbgSignalTracePoint(p) #define TGT_DBG_POST_TRACE_VALUE(v) TgtDbgPostTraceValue(v) #else @@ -172,7 +168,7 @@ enum hrtimer_restart EplTimerHighReskCallback(struct hrtimer *pTimer_p); // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskInit(void) +tEplKernel EplTimerHighReskInit(void) { tEplKernel Ret; @@ -196,7 +192,7 @@ tEplKernel PUBLIC EplTimerHighReskInit(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskAddInstance(void) +tEplKernel EplTimerHighReskAddInstance(void) { tEplKernel Ret; unsigned int uiIndex; @@ -206,13 +202,6 @@ tEplKernel PUBLIC EplTimerHighReskAddInstance(void) EPL_MEMSET(&EplTimerHighReskInstance_l, 0, sizeof(EplTimerHighReskInstance_l)); -#ifndef CONFIG_HIGH_RES_TIMERS - printk - ("EplTimerHighResk: Kernel symbol CONFIG_HIGH_RES_TIMERS is required.\n"); - Ret = kEplNoResource; - return Ret; -#endif - /* * Initialize hrtimer structures for all usable timers. */ @@ -244,7 +233,7 @@ tEplKernel PUBLIC EplTimerHighReskAddInstance(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskDelInstance(void) +tEplKernel EplTimerHighReskDelInstance(void) { tEplTimerHighReskTimerInfo *pTimerInfo; tEplKernel Ret; @@ -298,12 +287,11 @@ tEplKernel PUBLIC EplTimerHighReskDelInstance(void) // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, - unsigned long long ullTimeNs_p, - tEplTimerkCallback - pfnCallback_p, - unsigned long ulArgument_p, - BOOL fContinuously_p) +tEplKernel EplTimerHighReskModifyTimerNs(tEplTimerHdl *pTimerHdl_p, + unsigned long long ullTimeNs_p, + tEplTimerkCallback pfnCallback_p, + unsigned long ulArgument_p, + BOOL fContinuously_p) { tEplKernel Ret; unsigned int uiIndex; @@ -396,7 +384,7 @@ tEplKernel PUBLIC EplTimerHighReskModifyTimerNs(tEplTimerHdl * pTimerHdl_p, // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplTimerHighReskDeleteTimer(tEplTimerHdl * pTimerHdl_p) +tEplKernel EplTimerHighReskDeleteTimer(tEplTimerHdl *pTimerHdl_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiIndex; |