Staging: bcm: Remove unneeded do while loop in InterfaceRDM.
authorKevin McKinney <klmckinney1@gmail.com>
Sat, 13 Oct 2012 03:49:35 +0000 (23:49 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Oct 2012 20:42:23 +0000 (13:42 -0700)
This patch removes an unneeded do while loop which
sends a control message to bcm usb device. In this case,
the loop executes once because usRetries is
initialized to zero. After the first iteration
this variable will be 1. Therefore, the statement:
"usRetries < MAX_RDM_WRM_RETIRES" will evaluate to
false causing the do while statement to execute
once because MAX_RDM_WRM_RETIRES is equal to 1.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/bcm/InterfaceMisc.c

index 8c9cf2d38a5cad97d2bf8e014a01d97cd16e622f..f43e644752a8a120a289f35a9012a45d5d4e97ba 100644 (file)
@@ -6,7 +6,6 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
                int len)
 {
        int bytes;
-       unsigned short usRetries = 0;
 
        if (!psIntfAdapter) {
                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Interface Adapter is NULL");
@@ -29,27 +28,21 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
        }
        psIntfAdapter->psAdapter->DeviceAccess = TRUE;
 
-       do {
-               bytes = usb_control_msg(psIntfAdapter->udev,
-                                       usb_rcvctrlpipe(psIntfAdapter->udev, 0),
-                                       0x02,
-                                       0xC2,
-                                       (addr & 0xFFFF),
-                                       ((addr >> 16) & 0xFFFF),
-                                       buff,
-                                       len,
-                                       5000);
-
-               usRetries++;
-               if (-ENODEV == bytes) {
-                       psIntfAdapter->psAdapter->device_removed = TRUE;
-                       break;
-               }
+       bytes = usb_control_msg(psIntfAdapter->udev,
+                               usb_rcvctrlpipe(psIntfAdapter->udev, 0),
+                               0x02,
+                               0xC2,
+                               (addr & 0xFFFF),
+                               ((addr >> 16) & 0xFFFF),
+                               buff,
+                               len,
+                               5000);
 
-       } while ((bytes < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
+       if (-ENODEV == bytes)
+               psIntfAdapter->psAdapter->device_removed = TRUE;
 
        if (bytes < 0)
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", bytes, usRetries);
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d", bytes);
        else
                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", bytes);