From: Luca Ellero <luca.ellero@brickedbrain.com>
Date: Thu, 10 Jul 2014 09:02:09 +0000 (+0200)
Subject: staging: ced1401: fix ced_send_string()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4165106f362fa9ff35dd37bb0e227d74e072b151;p=linux-beck.git

staging: ced1401: fix ced_send_string()

Rename camel case arguments and locals in function ced_send_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 81289d7a622a..0c96202044b8 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -103,18 +103,19 @@ static int ced_put_chars(struct ced_data *ced, const char *ch,
 }
 
 /*****************************************************************************
-** Add the data in pData (local pointer) of length n to the output buffer, and
+** Add the data in "data" local pointer of length n to the output buffer, and
 ** trigger an output transfer if this is appropriate. User mode.
 ** Holds the io_mutex
 *****************************************************************************/
-int ced_send_string(struct ced_data *ced, const char __user *pData,
+int ced_send_string(struct ced_data *ced, const char __user *data,
 	       unsigned int n)
 {
-	int iReturn = U14ERR_NOERROR;	/*  assume all will be well */
-	char buffer[OUTBUF_SZ + 1];	/*  space in our address space for characters */
+	int ret = U14ERR_NOERROR;	/* assume all will be well */
+	char buffer[OUTBUF_SZ + 1];	/* space in our address space */
+					/* for characters             */
 	if (n > OUTBUF_SZ)	/*  check space in local buffer... */
 		return U14ERR_NOOUT;	/*  ...too many characters */
-	if (copy_from_user(buffer, pData, n))
+	if (copy_from_user(buffer, data, n))
 		return -EFAULT;
 	buffer[n] = 0;		/*  terminate for debug purposes */
 
@@ -122,13 +123,13 @@ int ced_send_string(struct ced_data *ced, const char __user *pData,
 	if (n > 0) {		/*  do nothing if nowt to do! */
 		dev_dbg(&ced->interface->dev, "%s: n=%d>%s<\n",
 			__func__, n, buffer);
-		iReturn = ced_put_chars(ced, buffer, n);
+		ret = ced_put_chars(ced, buffer, n);
 	}
 
 	ced_allowi(ced);		/*  make sure we have input int */
 	mutex_unlock(&ced->io_mutex);
 
-	return iReturn;
+	return ret;
 }
 
 /****************************************************************************
diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h
index f1825a3331d9..0c915621fcf2 100644
--- a/drivers/staging/ced1401/usb1401.h
+++ b/drivers/staging/ced1401/usb1401.h
@@ -222,7 +222,7 @@ extern int ced_read_write_mem(struct ced_data *ced, bool read,
 
 /*  in ced_ioc.c */
 extern int ced_clear_area(struct ced_data *ced, int nArea);
-extern int ced_send_string(struct ced_data *ced, const char __user *pData, unsigned int n);
+extern int ced_send_string(struct ced_data *ced, const char __user *data, unsigned int n);
 extern int ced_send_char(struct ced_data *ced, char c);
 extern int ced_get_state(struct ced_data *ced, __u32 *state, __u32 *error);
 extern int ced_read_write_cancel(struct ced_data *ced);