IB/hfi1: Simplify init_qpmap_table()

Make init_qpmap_table() easier to understand by simplifying
the loop indexing and writing each register when it is "full",
removing the need for a follow-on register write.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index 79dc29ae6e68020d18cb4f3d1c3c093dd4ad4839..56753c65b6145b096ddb0e852a4d3d9d14a227d5 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -13451,20 +13451,17 @@ static void init_qpmap_table(struct hfi1_devdata *dd,
        int i;
        u64 ctxt = first_ctxt;
 
-       for (i = 0; i < 256;) {
+       for (i = 0; i < 256; i++) {
                reg |= ctxt << (8 * (i % 8));
-               i++;
                ctxt++;
                if (ctxt > last_ctxt)
                        ctxt = first_ctxt;
-               if (i % 8 == 0) {
+               if (i % 8 == 7) {
                        write_csr(dd, regno, reg);
                        reg = 0;
                        regno += 8;
                }
        }
-       if (i % 8)
-               write_csr(dd, regno, reg);
 
        add_rcvctrl(dd, RCV_CTRL_RCV_QP_MAP_ENABLE_SMASK
                        | RCV_CTRL_RCV_BYPASS_ENABLE_SMASK);