mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 01:59:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: ced1401: rename GetString()

Browse Source 
rename camel case function GetString() to ced_get_string()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Luca Ellero
2014-06-30 11:58:04 +02:00
committed by Greg Kroah-Hartman
parent 0e218f1717
commit 395b78e0ba
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/ced1401/ced_ioc.c
View File

@@ -415,11 +415,11 @@ int ced_reset(DEVICE_EXTENSION *pdx)
}
/****************************************************************************
** GetChar
** ced_get_char
**
** Gets a single character from the 1401
****************************************************************************/
int GetChar(DEVICE_EXTENSION *pdx)
int ced_get_char(DEVICE_EXTENSION *pdx)
{
int iReturn = U14ERR_NOIN; /* assume we will get nothing */
mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */
@@ -446,7 +446,7 @@ int GetChar(DEVICE_EXTENSION *pdx)
}
/****************************************************************************
** GetString
** ced_get_string
**
** Gets a string from the 1401. Returns chars up to the next CR or when
** there are no more to read or nowhere to put them. CR is translated to
@@ -456,7 +456,7 @@ int GetChar(DEVICE_EXTENSION *pdx)
** returns the count of characters (including the terminator, or 0 if none
** or a negative error code.
****************************************************************************/
int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n)
int ced_get_string(DEVICE_EXTENSION *pdx, char __user *pUser, int n)
{
int nAvailable; /* character in the buffer */
int iReturn = U14ERR_NOIN;

4
drivers/staging/ced1401/usb1401.c
View File

@@ -1236,7 +1236,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg)
return ced_reset(pdx);
case _IOC_NR(IOCTL_CED_GETCHAR):
return GetChar(pdx);
return ced_get_char(pdx);
case _IOC_NR(IOCTL_CED_SENDCHAR):
return ced_send_char(pdx, (char)ulArg);
@@ -1248,7 +1248,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg)
return LineCount(pdx);
case _IOC_NR(IOCTL_CED_GETSTRING(0)):
return GetString(pdx, (char __user *)ulArg, _IOC_SIZE(cmd));
return ced_get_string(pdx, (char __user *)ulArg, _IOC_SIZE(cmd));
case _IOC_NR(IOCTL_CED_SETTRANSFER):
return SetTransfer(pdx, (struct transfer_area_desc __user *) ulArg);

4
drivers/staging/ced1401/usb1401.h
View File

@@ -214,8 +214,8 @@ extern int ced_send_char(DEVICE_EXTENSION *pdx, char c);
extern int ced_get_state(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error);
extern int ced_read_write_cancel(DEVICE_EXTENSION *pdx);
extern int ced_reset(DEVICE_EXTENSION *pdx);
extern int GetChar(DEVICE_EXTENSION *pdx);
extern int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n);
extern int ced_get_char(DEVICE_EXTENSION *pdx);
extern int ced_get_string(DEVICE_EXTENSION *pdx, char __user *pUser, int n);
extern int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD);
extern int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea);
extern int SetEvent(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE);