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/EplStatusu.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/EplStatusu.c')
-rw-r--r-- | drivers/staging/epl/EplStatusu.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/staging/epl/EplStatusu.c b/drivers/staging/epl/EplStatusu.c index 689f9124ae2..b291399af10 100644 --- a/drivers/staging/epl/EplStatusu.c +++ b/drivers/staging/epl/EplStatusu.c @@ -137,8 +137,7 @@ static tEplStatusuInstance EplStatusuInstance_g; // local function prototypes //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * - pFrameInfo_p); +static tEplKernel EplStatusuCbStatusResponse(tEplFrameInfo *pFrameInfo_p); //=========================================================================// // // @@ -164,7 +163,7 @@ static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuInit() +tEplKernel EplStatusuInit(void) { tEplKernel Ret; @@ -191,7 +190,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuInit() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuAddInstance() +tEplKernel EplStatusuAddInstance(void) { tEplKernel Ret; @@ -228,7 +227,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuAddInstance() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuDelInstance() +tEplKernel EplStatusuDelInstance(void) { tEplKernel Ret; @@ -258,7 +257,7 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuDelInstance() // //--------------------------------------------------------------------------- -EPLDLLEXPORT tEplKernel PUBLIC EplStatusuReset() +tEplKernel EplStatusuReset(void) { tEplKernel Ret; @@ -287,9 +286,8 @@ EPLDLLEXPORT tEplKernel PUBLIC EplStatusuReset() // //--------------------------------------------------------------------------- -tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, - tEplStatusuCbResponse - pfnCbResponse_p) +tEplKernel EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, + tEplStatusuCbResponse pfnCbResponse_p) { tEplKernel Ret; @@ -342,8 +340,7 @@ tEplKernel PUBLIC EplStatusuRequestStatusResponse(unsigned int uiNodeId_p, // State: // //--------------------------------------------------------------------------- -static tEplKernel PUBLIC EplStatusuCbStatusResponse(tEplFrameInfo * - pFrameInfo_p) +static tEplKernel EplStatusuCbStatusResponse(tEplFrameInfo *pFrameInfo_p) { tEplKernel Ret = kEplSuccessful; unsigned int uiNodeId; |