Staging: bcm: Remove unnecessary "do while" statement in, IOCTL_BCM_BUFFER_DOWNLOAD

This patch removes a superfluous "do while"
statement in IOCTL_BCM_BUFFER_DOWNLOAD.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 7cffbdd..1bf28c9 100644 (file)
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -792,59 +792,56 @@ cntrlEnd:
        case IOCTL_BCM_BUFFER_DOWNLOAD: {
                FIRMWARE_INFO *psFwInfo = NULL;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current->pid);
-               do {
-                       if (!down_trylock(&Adapter->fw_download_sema)) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                               "Invalid way to download buffer. Use Start and then call this!!!\n");
-                               Status = -EINVAL;
-                               break;
-                       }
-
-                       /* Copy Ioctl Buffer structure */
-                       if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                               return -EFAULT;
 
+               if (!down_trylock(&Adapter->fw_download_sema)) {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Length for FW DLD is : %lx\n", IoBuffer.InputLength);
+                                       "Invalid way to download buffer. Use Start and then call this!!!\n");
+                       Status = -EINVAL;
+                       break;
+               }
 
-                       if (IoBuffer.InputLength > sizeof(FIRMWARE_INFO))
-                               return -EINVAL;
+               /* Copy Ioctl Buffer structure */
+               if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                       return -EFAULT;
 
-                       psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
-                       if (!psFwInfo)
-                               return -ENOMEM;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Length for FW DLD is : %lx\n", IoBuffer.InputLength);
 
-                       if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                               return -EFAULT;
+               if (IoBuffer.InputLength > sizeof(FIRMWARE_INFO))
+                       return -EINVAL;
 
-                       if (!psFwInfo->pvMappedFirmwareAddress ||
-                               (psFwInfo->u32FirmwareLength == 0)) {
+               psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
+               if (!psFwInfo)
+                       return -ENOMEM;
 
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
-                                               psFwInfo->u32FirmwareLength);
-                               Status = -EINVAL;
-                               break;
-                       }
+               if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                       return -EFAULT;
 
-                       Status = bcm_ioctl_fw_download(Adapter, psFwInfo);
+               if (!psFwInfo->pvMappedFirmwareAddress ||
+                       (psFwInfo->u32FirmwareLength == 0)) {
 
-                       if (Status != STATUS_SUCCESS) {
-                               if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
-                                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");
-                               else
-                                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Firmware File Upload Failed\n");
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
+                                       psFwInfo->u32FirmwareLength);
+                       Status = -EINVAL;
+                       break;
+               }
 
-                               /* up(&Adapter->fw_download_sema); */
+               Status = bcm_ioctl_fw_download(Adapter, psFwInfo);
 
-                               if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-                                       Adapter->DriverState = DRIVER_INIT;
-                                       Adapter->LEDInfo.bLedInitDone = FALSE;
-                                       wake_up(&Adapter->LEDInfo.notify_led_event);
-                               }
-                       }
-                       break;
+               if (Status != STATUS_SUCCESS) {
+                       if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
+                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");
+                       else
+                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Firmware File Upload Failed\n");
+
+                       /* up(&Adapter->fw_download_sema); */
 
-               } while (0);
+                       if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
+                               Adapter->DriverState = DRIVER_INIT;
+                               Adapter->LEDInfo.bLedInitDone = FALSE;
+                               wake_up(&Adapter->LEDInfo.notify_led_event);
+                       }
+               }
 
                if (Status != STATUS_SUCCESS)
                        up(&Adapter->fw_download_sema);