From: Luca Ellero <luca.ellero@brickedbrain.com>
Date: Mon, 30 Jun 2014 09:58:04 +0000 (+0200)
Subject: staging: ced1401: rename GetString()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=395b78e0ba1fa86eb92f11b58ba15f9f844bf593;p=linux-beck.git

staging: ced1401: rename GetString()

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>
---

diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c
index 112cc13dd3f2..94244c47cef5 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -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;
diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c
index f8507b5725cf..6977dacaed43 100644
--- a/drivers/staging/ced1401/usb1401.c
+++ b/drivers/staging/ced1401/usb1401.c
@@ -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);
diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h
index 26c76f2b088f..9c409f3e36f4 100644
--- a/drivers/staging/ced1401/usb1401.h
+++ b/drivers/staging/ced1401/usb1401.h
@@ -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);