From 9db5b4e98c207cc6f743d838c60e0b4eb763f678 Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Mon, 30 Jun 2014 12:00:44 +0200 Subject: [PATCH] staging: ced1401: rename FreeCircBlock() rename camel case function FreeCircBlock() to ced_free_circ_block() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/ced_ioc.c | 4 ++-- drivers/staging/ced1401/usb1401.c | 2 +- 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 113d4c5de23b..36cf974c106a 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -1381,11 +1381,11 @@ int ced_get_circ_block(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) } /**************************************************************************** -** FreeCircBlock +** ced_free_circ_block ** ** Frees a block of circularly-transferred data and returns the next one. ****************************************************************************/ -int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) +int ced_free_circ_block(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) { int iReturn = U14ERR_NOERROR; unsigned int nArea, uStart, uSize; diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 554e8446261f..b44140f2e225 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1322,7 +1322,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_get_circ_block(pdx, (TCIRCBLOCK __user *) ulArg); case _IOC_NR(IOCTL_CED_FREECIRCBLOCK): - return FreeCircBlock(pdx, (TCIRCBLOCK __user *) ulArg); + return ced_free_circ_block(pdx, (TCIRCBLOCK __user *) ulArg); case _IOC_NR(IOCTL_CED_WAITEVENT): return ced_wait_event(pdx, (int)(ulArg & 0xff), (int)(ulArg >> 8)); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 6fa4e598ec3f..8e2e68e167cb 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -237,7 +237,7 @@ 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 ced_get_circ_block(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); -extern int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); +extern int ced_free_circ_block(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); #endif -- 2.34.1