Commit 1971a00e authored by Luca Ellero's avatar Luca Ellero Committed by Greg Kroah-Hartman

staging: ced1401: rename WaitEvent()

rename camel case function WaitEvent() to ced_wait_event()
Signed-off-by: default avatarLuca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 617bfec3
...@@ -809,12 +809,12 @@ int ced_set_event(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE) ...@@ -809,12 +809,12 @@ int ced_set_event(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE)
} }
/**************************************************************************** /****************************************************************************
** WaitEvent ** ced_wait_event
** Sleep the process with a timeout waiting for an event. Returns the number ** Sleep the process with a timeout waiting for an event. Returns the number
** of times that a block met the event condition since we last cleared it or ** of times that a block met the event condition since we last cleared it or
** 0 if timed out, or -ve error (bad area or not set, or signal). ** 0 if timed out, or -ve error (bad area or not set, or signal).
****************************************************************************/ ****************************************************************************/
int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut) int ced_wait_event(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut)
{ {
int iReturn; int iReturn;
if ((unsigned)nArea >= MAX_TRANSAREAS) if ((unsigned)nArea >= MAX_TRANSAREAS)
...@@ -857,7 +857,7 @@ int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut) ...@@ -857,7 +857,7 @@ int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut)
/**************************************************************************** /****************************************************************************
** TestEvent ** TestEvent
** Test the event to see if a WaitEvent would return immediately. Returns the ** 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 ** number of times a block completed since the last call, or 0 if none or a
** negative error. ** negative error.
****************************************************************************/ ****************************************************************************/
......
...@@ -1325,7 +1325,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) ...@@ -1325,7 +1325,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg)
return FreeCircBlock(pdx, (TCIRCBLOCK __user *) ulArg); return FreeCircBlock(pdx, (TCIRCBLOCK __user *) ulArg);
case _IOC_NR(IOCTL_CED_WAITEVENT): case _IOC_NR(IOCTL_CED_WAITEVENT):
return WaitEvent(pdx, (int)(ulArg & 0xff), (int)(ulArg >> 8)); return ced_wait_event(pdx, (int)(ulArg & 0xff), (int)(ulArg >> 8));
case _IOC_NR(IOCTL_CED_TESTEVENT): case _IOC_NR(IOCTL_CED_TESTEVENT):
return TestEvent(pdx, (int)ulArg); return TestEvent(pdx, (int)ulArg);
......
...@@ -239,6 +239,6 @@ extern int DbgStopLoop(DEVICE_EXTENSION *pdx); ...@@ -239,6 +239,6 @@ extern int DbgStopLoop(DEVICE_EXTENSION *pdx);
extern int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); extern int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD);
extern int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); extern int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB);
extern int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); extern int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB);
extern int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut); extern int ced_wait_event(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut);
extern int TestEvent(DEVICE_EXTENSION *pdx, int nArea); extern int TestEvent(DEVICE_EXTENSION *pdx, int nArea);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment