[PATCH 5/6] staging: qlge: qlge_mpi: Simplify while statements.

[Suraj Upadhyay]

Simplify while loops into more readable and simple for loops.

Signed-off-by: Suraj Upadhyay <usura...@gmail.com>
---
 drivers/staging/qlge/qlge_mpi.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c
index fa178fc642a6..3b71e5fc2cd0 100644
--- a/drivers/staging/qlge/qlge_mpi.c
+++ b/drivers/staging/qlge/qlge_mpi.c
@@ -17,36 +17,34 @@ int ql_unpause_mpi_risc(struct ql_adapter *qdev)
 int ql_pause_mpi_risc(struct ql_adapter *qdev)
 {
        u32 tmp;
-       int count = UDELAY_COUNT;
+       int count;
 
        /* Pause the RISC */
        ql_write32(qdev, CSR, CSR_CMD_SET_PAUSE);
-       do {
+       for (count = UDELAY_COUNT; count; count--) {
                tmp = ql_read32(qdev, CSR);
                if (tmp & CSR_RP)
                        break;
                mdelay(UDELAY_DELAY);
-               count--;
-       } while (count);
+       }
        return (count == 0) ? -ETIMEDOUT : 0;
 }
 
 int ql_hard_reset_mpi_risc(struct ql_adapter *qdev)
 {
        u32 tmp;
-       int count = UDELAY_COUNT;
+       int count;
 
        /* Reset the RISC */
        ql_write32(qdev, CSR, CSR_CMD_SET_RST);
-       do {
+       for (count = UDELAY_COUNT; count; count--) {
                tmp = ql_read32(qdev, CSR);
                if (tmp & CSR_RR) {
                        ql_write32(qdev, CSR, CSR_CMD_CLR_RST);
                        break;
                }
                mdelay(UDELAY_DELAY);
-               count--;
-       } while (count);
+       }
        return (count == 0) ? -ETIMEDOUT : 0;
 }
 
@@ -147,15 +145,15 @@ static int ql_get_mb_sts(struct ql_adapter *qdev, struct 
mbox_params *mbcp)
  */
 static int ql_wait_mbx_cmd_cmplt(struct ql_adapter *qdev)
 {
-       int count = 100;
+       int count;
        u32 value;
 
-       do {
+       for (count = 100; count; count--) {
                value = ql_read32(qdev, STS);
                if (value & STS_PI)
                        return 0;
                mdelay(UDELAY_DELAY); /* 100ms */
-       } while (--count);
+       }
        return -ETIMEDOUT;
 }
 
@@ -913,10 +911,10 @@ int ql_mb_wol_set_magic(struct ql_adapter *qdev, u32 
enable_wol)
 static int ql_idc_wait(struct ql_adapter *qdev)
 {
        int status = -ETIMEDOUT;
-       long wait_time = 1 * HZ;
        struct mbox_params *mbcp = &qdev->idc_mbc;
+       long wait_time;
 
-       do {
+       for (wait_time = 1 * HZ; wait_time;) {
                /* Wait here for the command to complete
                 * via the IDC process.
                 */
@@ -946,7 +944,7 @@ static int ql_idc_wait(struct ql_adapter *qdev)
                        status = -EIO;
                        break;
                }
-       } while (wait_time);
+       }
 
        return status;
 }
@@ -1079,18 +1077,18 @@ static int ql_mb_get_mgmnt_traffic_ctl(struct 
ql_adapter *qdev, u32 *control)
 
 int ql_wait_fifo_empty(struct ql_adapter *qdev)
 {
-       int count = 5;
+       int count;
        u32 mgmnt_fifo_empty;
        u32 nic_fifo_empty;
 
-       do {
+       for (count = 6; count; count--) {
                nic_fifo_empty = ql_read32(qdev, STS) & STS_NFE;
                ql_mb_get_mgmnt_traffic_ctl(qdev, &mgmnt_fifo_empty);
                mgmnt_fifo_empty &= MB_GET_MPI_TFK_FIFO_EMPTY;
                if (nic_fifo_empty && mgmnt_fifo_empty)
                        return 0;
                msleep(100);
-       } while (count-- > 0);
+       }
        return -ETIMEDOUT;
 }
 
-- 
2.17.1

signature.asc
Description: PGP signature

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