Commit 9db5b4e9 authored Jun 30, 2014 by Luca Ellero Committed by Greg Kroah-Hartman Jul 08, 2014

staging: ced1401: rename FreeCircBlock()

rename camel case function FreeCircBlock() to ced_free_circ_block()

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

parent 24d71e9d

drivers/staging/ced1401/ced_ioc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

drivers/staging/ced1401/usb1401.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));

drivers/staging/ced1401/usb1401.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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