From 31530abba10578b65e89716f1129051e7fa9eb2b Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Mon, 30 Jun 2014 12:00:42 +0200 Subject: [PATCH] staging: ced1401: rename SetCircular() rename camel case function SetCircular() to ced_set_circular() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/ced_ioc.c | 6 +++--- drivers/staging/ced1401/usb1401.c | 2 +- drivers/staging/ced1401/usb1401.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index e46a7b656870..7b6ea79839b6 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -658,7 +658,7 @@ int ced_clear_area(DEVICE_EXTENSION *pdx, int nArea) ** ced_set_area ** ** Sets up a transfer area - the functional part. Called by both -** ced_set_transfer and SetCircular. +** ced_set_transfer and ced_set_circular. ****************************************************************************/ static int ced_set_area(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf, unsigned int dwLength, bool bCircular, bool bCircToHost) @@ -1299,14 +1299,14 @@ int ced_dbg_stop_loop(DEVICE_EXTENSION *pdx) } /**************************************************************************** -** SetCircular +** ced_set_circular ** ** Sets up a transfer area record for circular transfers. If the area is ** already set, we attempt to unset it. Unsetting will fail if the area is ** booked and a transfer to that area is in progress. Otherwise, we will ** release the area and re-assign it. ****************************************************************************/ -int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD) +int ced_set_circular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD) { int iReturn; bool bToHost; diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 3c65c550585b..ddaa06f4b632 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1316,7 +1316,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) break; case _IOC_NR(IOCTL_CED_SETCIRCULAR): - return SetCircular(pdx, (struct transfer_area_desc __user *) ulArg); + return ced_set_circular(pdx, (struct transfer_area_desc __user *) ulArg); case _IOC_NR(IOCTL_CED_GETCIRCBLOCK): return GetCircBlock(pdx, (TCIRCBLOCK __user *) ulArg); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 8f7b7e3c832b..200c0dae9c5c 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -235,7 +235,7 @@ extern int ced_dbg_ramp_data(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB); extern int ced_dbg_ramp_addr(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB); extern int ced_dbg_get_data(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB); extern int ced_dbg_stop_loop(DEVICE_EXTENSION *pdx); -extern int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); +extern int ced_set_circular(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 ced_wait_event(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut); -- 2.11.0