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

staging: ced1401: rename GetCircBlock()

rename camel case function GetCircBlock() to ced_get_circ_block()

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

parent 31530abb

drivers/staging/ced1401/ced_ioc.c

+2 −2

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

drivers/staging/ced1401/usb1401.c

+1 −1

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

drivers/staging/ced1401/usb1401.h

+1 −1

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