diff options
| author |   Luca Ellero <luca.ellero@brickedbrain.com> | 2014-06-30 11:58:14 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-08 15:58:13 -0700 |
| commit | b76530bba88fa43ece9caa1f5e46c91b793012cb (patch) | |
| tree | 228fd5eace2b8e19d98008a750e490800e29a102 | |
| parent | staging: ced1401: rename WaitEvent() (diff) | |
staging: ced1401: rename TestEvent()
rename camel case function TestEvent() to ced_test_event()
Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ced1401/ced_ioc.c | 4 | ||||
| -rw-r--r-- | drivers/staging/ced1401/usb1401.c | 2 | ||||
| -rw-r--r-- | drivers/staging/ced1401/usb1401.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index 5972fd0c4f8b..f868a65292ca 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -856,12 +856,12 @@ int ced_wait_event(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut) } /**************************************************************************** -** TestEvent +** ced_test_event ** Test the event to see if a ced_wait_event would return immediately. Returns the ** number of times a block completed since the last call, or 0 if none or a ** negative error. ****************************************************************************/ -int TestEvent(DEVICE_EXTENSION *pdx, int nArea) +int ced_test_event(DEVICE_EXTENSION *pdx, int nArea) { int iReturn; if ((unsigned)nArea >= MAX_TRANSAREAS) diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 1e1f6dcb48cd..25f4a47744b6 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1328,7 +1328,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_wait_event(pdx, (int)(ulArg & 0xff), (int)(ulArg >> 8)); case _IOC_NR(IOCTL_CED_TESTEVENT): - return TestEvent(pdx, (int)ulArg); + return ced_test_event(pdx, (int)ulArg); default: return U14ERR_NO_SUCH_FN; diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 3a6db9ca3e13..11ffb5921a92 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -240,5 +240,5 @@ extern int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user * extern int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); extern int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); extern int ced_wait_event(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut); -extern int TestEvent(DEVICE_EXTENSION *pdx, int nArea); +extern int ced_test_event(DEVICE_EXTENSION *pdx, int nArea); #endif |