From: Luca Ellero <luca.ellero@brickedbrain.com>
Date: Thu, 10 Jul 2014 09:03:59 +0000 (+0200)
Subject: staging: ced1401: fix ced_get_transfer()
X-Git-Tag: firefly_0821_release~176^2~3491^2~984
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1b9286e29851128504cfb5be8c526706f979fab;p=firefly-linux-kernel-4.4.55.git

staging: ced1401: fix ced_get_transfer()

Rename camel case arguments and locals in function ced_get_transfer()

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 47ef5ddcb4ce..80bc213f1604 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -939,17 +939,18 @@ int ced_test_event(struct ced_data *ced, int area)
 ** ced_get_transferInfo
 ** Puts the current state of the 1401 in a TGET_TX_BLOCK.
 *****************************************************************************/
-int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *pTX)
+int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *utx)
 {
-	int iReturn = U14ERR_NOERROR;
+	int ret = U14ERR_NOERROR;
 	unsigned int dwIdent;
 
 	mutex_lock(&ced->io_mutex);
 	dwIdent = ced->staged_id;	/*  area ident for last xfer */
 	if (dwIdent >= MAX_TRANSAREAS)
-		iReturn = U14ERR_BADAREA;
+		ret = U14ERR_BADAREA;
 	else {
-		/*  Return the best information we have - we don't have physical addresses */
+		/* Return the best information we have - we */
+		/* don't have physical addresses	    */
 		TGET_TX_BLOCK *tx;
 
 		tx = kzalloc(sizeof(*tx), GFP_KERNEL);
@@ -959,18 +960,19 @@ int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *pTX)
 		}
 		tx->size = ced->trans_def[dwIdent].length;
 		tx->linear = (long long)((long)ced->trans_def[dwIdent].buff);
-		tx->avail = GET_TX_MAXENTRIES;	/*  how many blocks we could return */
+		/* how many blocks we could return */
+		tx->avail = GET_TX_MAXENTRIES;
 		tx->used = 1;	/*  number we actually return */
 		tx->entries[0].physical =
 		    (long long)(tx->linear + ced->staged_offset);
 		tx->entries[0].size = tx->size;
 
-		if (copy_to_user(pTX, tx, sizeof(*tx)))
-			iReturn = -EFAULT;
+		if (copy_to_user(utx, tx, sizeof(*tx)))
+			ret = -EFAULT;
 		kfree(tx);
 	}
 	mutex_unlock(&ced->io_mutex);
-	return iReturn;
+	return ret;
 }
 
 /****************************************************************************
diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h
index 30dbe5bf9c8a..c5a4118454a2 100644
--- a/drivers/staging/ced1401/usb1401.h
+++ b/drivers/staging/ced1401/usb1401.h
@@ -237,7 +237,7 @@ extern int ced_set_event(struct ced_data *ced,
 extern int ced_stat_1401(struct ced_data *ced);
 extern int ced_line_count(struct ced_data *ced);
 extern int ced_get_out_buf_space(struct ced_data *ced);
-extern int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *pGTB);
+extern int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *utx);
 extern int ced_kill_io(struct ced_data *ced);
 extern int ced_state_of_1401(struct ced_data *ced);
 extern int ced_start_self_test(struct ced_data *ced);