scsi: mpt3sas: Refactor mpt3sas_wait_for_ioc function

No functional change. Doing code refactor of function
mpt3sas_wait_for_ioc() for better readability.

Signed-off-by: Suganath Prabu <suganath-prabu.subramani@broadcom.com>
Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 3b5f28a8fbccf050399603d54c047ed8a6c039f2..f25bc3c4f5ac5d3b51ad36b7b762b5781458e34d 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -5093,22 +5093,20 @@ mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int timeout)
        int wait_state_count = 0;
        u32 ioc_state;
 
-       ioc_state = mpt3sas_base_get_iocstate(ioc, 1);
-       while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {
-
-               if (wait_state_count++ == timeout) {
-                       ioc_err(ioc, "%s: failed due to ioc not operational\n",
-                               __func__);
-                       return -EFAULT;
-               }
-               ssleep(1);
+       do {
                ioc_state = mpt3sas_base_get_iocstate(ioc, 1);
+               if (ioc_state == MPI2_IOC_STATE_OPERATIONAL)
+                       break;
+               ssleep(1);
                ioc_info(ioc, "%s: waiting for operational state(count=%d)\n",
-                        __func__, wait_state_count);
+                               __func__, ++wait_state_count);
+       } while (--timeout);
+       if (!timeout) {
+               ioc_err(ioc, "%s: failed due to ioc not operational\n", __func__);
+               return -EFAULT;
        }
        if (wait_state_count)
                ioc_info(ioc, "ioc is operational\n");
-
        return 0;
 }