From: Luca Ellero Date: Mon, 30 Jun 2014 10:00:43 +0000 (+0200) Subject: staging: ced1401: rename GetCircBlock() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=24d71e9d24744a3c2d3ea9140b1c8cb17646a846;p=linux-beck.git staging: ced1401: rename GetCircBlock() rename camel case function GetCircBlock() to ced_get_circ_block() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index 7b6ea79839b6..113d4c5de23b 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -1332,11 +1332,11 @@ int ced_set_circular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pT } /**************************************************************************** -** GetCircBlock +** ced_get_circ_block ** ** Return the next available block of circularly-transferred data. ****************************************************************************/ -int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) +int ced_get_circ_block(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) { int iReturn = U14ERR_NOERROR; unsigned int nArea; diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index ddaa06f4b632..554e8446261f 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1319,7 +1319,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_set_circular(pdx, (struct transfer_area_desc __user *) ulArg); case _IOC_NR(IOCTL_CED_GETCIRCBLOCK): - return GetCircBlock(pdx, (TCIRCBLOCK __user *) ulArg); + return ced_get_circ_block(pdx, (TCIRCBLOCK __user *) ulArg); case _IOC_NR(IOCTL_CED_FREECIRCBLOCK): return FreeCircBlock(pdx, (TCIRCBLOCK __user *) ulArg); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 200c0dae9c5c..6fa4e598ec3f 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -236,7 +236,7 @@ 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 ced_set_circular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); -extern int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); +extern int ced_get_circ_block(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 ced_test_event(DEVICE_EXTENSION *pdx, int nArea);