Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: ced1401: rename SendChar()



rename camel case function SendChar() to ced_send_char()

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

parent 747ce582

drivers/staging/ced1401/ced_ioc.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -130,16 +130,16 @@ int ced_send_string(DEVICE_EXTENSION pdx, const char __user pData,
	}		}

	/****************************************************************************		/****************************************************************************
	** SendChar		** ced_send_char
	**		**
	** Sends a single character to the 1401. User mode, holds io_mutex.		** Sends a single character to the 1401. User mode, holds io_mutex.
	****************************************************************************/		****************************************************************************/
	int SendChar(DEVICE_EXTENSION *pdx, char c)		int ced_send_char(DEVICE_EXTENSION *pdx, char c)
	{		{
	int iReturn;		int iReturn;
	mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */		mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */
	iReturn = ced_put_chars(pdx, &c, 1);		iReturn = ced_put_chars(pdx, &c, 1);
	dev_dbg(&pdx->interface->dev, "SendChar >%c< (0x%02x)\n", c, c);		dev_dbg(&pdx->interface->dev, "ced_send_char >%c< (0x%02x)\n", c, c);
	ced_allowi(pdx); /* Make sure char reads are running */		ced_allowi(pdx); /* Make sure char reads are running */
	mutex_unlock(&pdx->io_mutex);		mutex_unlock(&pdx->io_mutex);
	return iReturn;		return iReturn;

drivers/staging/ced1401/usb1401.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1239,7 +1239,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg)
	return GetChar(pdx);		return GetChar(pdx);

	case _IOC_NR(IOCTL_CED_SENDCHAR):		case _IOC_NR(IOCTL_CED_SENDCHAR):
	return SendChar(pdx, (char)ulArg);		return ced_send_char(pdx, (char)ulArg);

	case _IOC_NR(IOCTL_CED_STAT1401):		case _IOC_NR(IOCTL_CED_STAT1401):
	return Stat1401(pdx);		return Stat1401(pdx);

drivers/staging/ced1401/usb1401.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -210,7 +210,7 @@ extern int ced_read_write_mem(DEVICE_EXTENSION *pdx, bool Read, unsigned short w
	/* in ced_ioc.c */		/* in ced_ioc.c */
	extern int ClearArea(DEVICE_EXTENSION *pdx, int nArea);		extern int ClearArea(DEVICE_EXTENSION *pdx, int nArea);
	extern int ced_send_string(DEVICE_EXTENSION pdx, const char __user pData, unsigned int n);		extern int ced_send_string(DEVICE_EXTENSION pdx, const char __user pData, unsigned int n);
	extern int SendChar(DEVICE_EXTENSION *pdx, char c);		extern int ced_send_char(DEVICE_EXTENSION *pdx, char c);
	extern int Get1401State(DEVICE_EXTENSION pdx, __u32 state, __u32 *error);		extern int Get1401State(DEVICE_EXTENSION pdx, __u32 state, __u32 *error);
	extern int ReadWrite_Cancel(DEVICE_EXTENSION *pdx);		extern int ReadWrite_Cancel(DEVICE_EXTENSION *pdx);
	extern bool Is1401(DEVICE_EXTENSION *pdx);		extern bool Is1401(DEVICE_EXTENSION *pdx);