From: Luca Ellero <luca.ellero@brickedbrain.com>
Date: Mon, 30 Jun 2014 09:58:13 +0000 (+0200)
Subject: staging: ced1401: rename WaitEvent()
X-Git-Tag: firefly_0821_release~176^2~3491^2~1206
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1971a00e5d6f779428bbc2cc147fd31c39e10ed5;p=firefly-linux-kernel-4.4.55.git

staging: ced1401: rename WaitEvent()

rename camel case function WaitEvent() to ced_wait_event()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c
index 6210dde70e11..5972fd0c4f8b 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -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
 ** 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).
 ****************************************************************************/
-int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut)
+int ced_wait_event(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut)
 {
 	int iReturn;
 	if ((unsigned)nArea >= MAX_TRANSAREAS)
@@ -857,7 +857,7 @@ int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut)
 
 /****************************************************************************
 ** 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
 ** negative error.
 ****************************************************************************/
diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c
index c9b01bef4515..1e1f6dcb48cd 100644
--- a/drivers/staging/ced1401/usb1401.c
+++ b/drivers/staging/ced1401/usb1401.c
@@ -1325,7 +1325,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg)
 		return FreeCircBlock(pdx, (TCIRCBLOCK __user *) ulArg);
 
 	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):
 		return TestEvent(pdx, (int)ulArg);
diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h
index a1968a8088df..3a6db9ca3e13 100644
--- a/drivers/staging/ced1401/usb1401.h
+++ b/drivers/staging/ced1401/usb1401.h
@@ -239,6 +239,6 @@ extern int DbgStopLoop(DEVICE_EXTENSION *pdx);
 extern int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD);
 extern int GetCircBlock(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);
 #endif