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

staging: ced1401: fix ced_is_1401()

Rename camel case arguments and locals in function ced_is_1401()

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 528061bdbc87..194aa188e137 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -310,45 +310,51 @@ static int ced_in_self_test(struct ced_data *ced, unsigned int *stat)
 ****************************************************************************/
 static bool ced_is_1401(struct ced_data *ced)
 {
-	int iReturn;
+	int ret;
 	dev_dbg(&ced->interface->dev, "%s\n", __func__);
 
 	ced_draw_down(ced);	/*  wait for, then kill outstanding Urbs */
 	ced_flush_in_buff(ced);	/*  Clear out input buffer & pipe */
 	ced_flush_out_buff(ced);	/*  Clear output buffer & pipe */
 
-	/*  The next call returns 0 if OK, but has returned 1 in the past, meaning that */
-	/*  usb_unlock_device() is needed... now it always is */
-	iReturn = usb_lock_device_for_reset(ced->udev, ced->interface);
-
-	/*  release the io_mutex because if we don't, we will deadlock due to system */
-	/*  calls back into the driver. */
-	mutex_unlock(&ced->io_mutex);	/*  locked, so we will not get system calls */
-	if (iReturn >= 0) {	/*  if we failed */
-		iReturn = usb_reset_device(ced->udev);	/*  try to do the reset */
-		usb_unlock_device(ced->udev);	/*  undo the lock */
+	/* The next call returns 0 if OK, but has returned 1 in the past, */
+	/* meaning that usb_unlock_device() is needed... now it always is */
+	ret = usb_lock_device_for_reset(ced->udev, ced->interface);
+
+	/*  release the io_mutex because if we don't, we will deadlock due to */
+	/* system calls back into the driver.				      */
+	mutex_unlock(&ced->io_mutex); /* locked, so we will not get */
+				      /* system calls		    */
+	if (ret >= 0) {	/*  if we failed */
+		ret = usb_reset_device(ced->udev); /* try to do the reset */
+		usb_unlock_device(ced->udev);	/* undo the lock */
 	}
 
 	mutex_lock(&ced->io_mutex);	/*  hold stuff off while we wait */
 	ced->dma_flag = MODE_CHAR;	/*  Clear DMA mode flag regardless! */
-	if (iReturn == 0) {	/*  if all is OK still */
+	if (ret == 0) {	/*  if all is OK still */
 		unsigned int state;
-		iReturn = ced_in_self_test(ced, &state);	/*  see if likely in self test */
-		if (iReturn > 0) {	/*  do we need to wait for self-test? */
-			unsigned long ulTimeOut = jiffies + 30 * HZ;	/*  when to give up */
-			while ((iReturn > 0) && time_before(jiffies, ulTimeOut)) {
+		ret = ced_in_self_test(ced, &state); /* see if likely in */
+						     /* self test 	 */
+		if (ret > 0) {	/*  do we need to wait for self-test? */
+			/* when to give up */
+			unsigned long timeout = jiffies + 30 * HZ;
+			while ((ret > 0) && time_before(jiffies, timeout)) {
 				schedule();	/*  let other stuff run */
-				iReturn = ced_in_self_test(ced, &state);	/*  see if done yet */
+
+				/* see if done yet */
+				ret = ced_in_self_test(ced, &state);
 			}
 		}
 
-		if (iReturn == 0)	/*  if all is OK... */
-			iReturn = state == 0;	/*  then success is that the state is 0 */
+		if (ret == 0)	/*  if all is OK... */
+			/* then success is that the state is 0 */
+			ret = state == 0;
 	} else
-		iReturn = 0;	/*  we failed */
+		ret = 0;	/*  we failed */
 	ced->force_reset = false;	/*  Clear forced reset flag now */
 
-	return iReturn > 0;
+	return ret > 0;
 }
 
 /****************************************************************************