[PATCH v2 55/60] staging: ced1401: fix ced_get_circ_block()

[Luca Ellero <luca.ellero@xxxxxxxxxxxxxxxx>]

Rename camel case arguments and locals in function ced_get_circ_block()

Signed-off-by: Luca Ellero <luca.ellero@xxxxxxxxxxxxxxxx>
---
 drivers/staging/ced1401/ced_ioc.c |   34 +++++++++++++++++-----------------
 drivers/staging/ced1401/usb1401.h |    2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c
index efc1db9..73ec4bc 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -1406,49 +1406,49 @@ int ced_set_circular(struct ced_data *ced,
 **
 ** Return the next available block of circularly-transferred data.
 ****************************************************************************/
-int ced_get_circ_block(struct ced_data *ced, TCIRCBLOCK __user *pCB)
+int ced_get_circ_block(struct ced_data *ced, TCIRCBLOCK __user *ucb)
 {
-	int iReturn = U14ERR_NOERROR;
-	unsigned int nArea;
+	int ret = U14ERR_NOERROR;
+	unsigned int area;
 	TCIRCBLOCK cb;
 
 	dev_dbg(&ced->interface->dev, "%s\n", __func__);
 
-	if (copy_from_user(&cb, pCB, sizeof(cb)))
+	if (copy_from_user(&cb, ucb, sizeof(cb)))
 		return -EFAULT;
 
 	mutex_lock(&ced->io_mutex);
 
-	nArea = cb.nArea;	/*  Retrieve parameters first */
+	area = cb.nArea;	/*  Retrieve parameters first */
 	cb.dwOffset = 0;	/*  set default result (nothing) */
 	cb.dwSize = 0;
 
-	if (nArea < MAX_TRANSAREAS) {	/*  The area number must be OK */
+	if (area < MAX_TRANSAREAS) {	/*  The area number must be OK */
 		/* Pointer to relevant info */
-		struct transarea *pArea = &ced->trans_def[nArea];
+		struct transarea *ta = &ced->trans_def[area];
 		spin_lock_irq(&ced->staged_lock);	/*  Lock others out */
 
-		if ((pArea->used) && (pArea->circular) &&	/*  Must be circular area */
-		    (pArea->circ_to_host)) {	/*  For now at least must be to host */
-			if (pArea->blocks[0].size > 0) {	/*  Got anything? */
-				cb.dwOffset = pArea->blocks[0].offset;
-				cb.dwSize = pArea->blocks[0].size;
+		if ((ta->used) && (ta->circular) && /* Must be circular area */
+		    (ta->circ_to_host)) { /* For now at least must be to host */
+			if (ta->blocks[0].size > 0) {	/*  Got anything? */
+				cb.dwOffset = ta->blocks[0].offset;
+				cb.dwSize = ta->blocks[0].size;
 				dev_dbg(&ced->interface->dev,
 					"%s: return block 0: %d bytes at %d\n",
 					__func__, cb.dwSize, cb.dwOffset);
 			}
 		} else
-			iReturn = U14ERR_NOTSET;
+			ret = U14ERR_NOTSET;
 
 		spin_unlock_irq(&ced->staged_lock);
 	} else
-		iReturn = U14ERR_BADAREA;
+		ret = U14ERR_BADAREA;
 
-	if (copy_to_user(pCB, &cb, sizeof(cb)))
-		iReturn = -EFAULT;
+	if (copy_to_user(ucb, &cb, sizeof(cb)))
+		ret = -EFAULT;
 
 	mutex_unlock(&ced->io_mutex);
-	return iReturn;
+	return ret;
 }
 
 /****************************************************************************
diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h
index a0d19aa..2dd4d92 100644
--- a/drivers/staging/ced1401/usb1401.h
+++ b/drivers/staging/ced1401/usb1401.h
@@ -253,7 +253,7 @@ extern int ced_dbg_get_data(struct ced_data *ced, TDBGBLOCK __user *udb);
 extern int ced_dbg_stop_loop(struct ced_data *ced);
 extern int ced_set_circular(struct ced_data *ced,
 			    struct transfer_area_desc __user *utd);
-extern int ced_get_circ_block(struct ced_data *ced, TCIRCBLOCK __user *pCB);
+extern int ced_get_circ_block(struct ced_data *ced, TCIRCBLOCK __user *ucb);
 extern int ced_free_circ_block(struct ced_data *ced, TCIRCBLOCK __user *pCB);
 extern int ced_wait_event(struct ced_data *ced, int area, int time_out);
 extern int ced_test_event(struct ced_data *ced, int area);
-- 
1.7.10.4

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel