RDMA/nes: Cleanup cqp_request list usage

Use nes_free_cqp_request() instead of open coding.  Change some
continue to break in nes_cm_timer_tick, because send_entry used to be
a list processed in a loop (so continue went to the next item).  Now
it is a single item, so using break is correct.

Signed-off-by: Faisal Latif <faisal.latif@intel.com>
Signed-off-by: Chien Tung <chien.tin.tung@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 10 insertions, 35 deletions

diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index d36c9a0bf1bb..4fdb72454f94 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1695,13 +1695,8 @@ static struct ib_cq *nes_create_cq(struct ib_device *ibdev, int entries,
                         /* use 4k pbl */
                         nes_debug(NES_DBG_CQ, "pbl_entries=%u, use a 4k PBL\n", pbl_entries);
                         if (nesadapter->free_4kpbl == 0) {
-                                if (cqp_request->dynamic) {
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                        kfree(cqp_request);
-                                } else {
-                                        list_add_tail(&cqp_request->list, &nesdev->cqp_avail_reqs);
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                }
+                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+                                nes_free_cqp_request(nesdev, cqp_request);
                                 if (!context)
                                         pci_free_consistent(nesdev->pcidev, nescq->cq_mem_size, mem,
                                                         nescq->hw_cq.cq_pbase);
@@ -1717,13 +1712,8 @@ static struct ib_cq *nes_create_cq(struct ib_device *ibdev, int entries,
                         /* use 256 byte pbl */
                         nes_debug(NES_DBG_CQ, "pbl_entries=%u, use a 256 byte PBL\n", pbl_entries);
                         if (nesadapter->free_256pbl == 0) {
-                                if (cqp_request->dynamic) {
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                        kfree(cqp_request);
-                                } else {
-                                        list_add_tail(&cqp_request->list, &nesdev->cqp_avail_reqs);
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                }
+                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+                                nes_free_cqp_request(nesdev, cqp_request);
                                 if (!context)
                                         pci_free_consistent(nesdev->pcidev, nescq->cq_mem_size, mem,
                                                         nescq->hw_cq.cq_pbase);
@@ -1928,13 +1918,8 @@ static int nes_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd,
                         /* Two level PBL */
                         if ((pbl_count+1) > nesadapter->free_4kpbl) {
                                 nes_debug(NES_DBG_MR, "Out of 4KB Pbls for two level request.\n");
-                                if (cqp_request->dynamic) {
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                        kfree(cqp_request);
-                                } else {
-                                        list_add_tail(&cqp_request->list, &nesdev->cqp_avail_reqs);
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                }
+                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+                                nes_free_cqp_request(nesdev, cqp_request);
                                 return -ENOMEM;
                         } else {
                                 nesadapter->free_4kpbl -= pbl_count+1;
@@ -1942,13 +1927,8 @@ static int nes_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd,
                 } else if (residual_page_count > 32) {
                         if (pbl_count > nesadapter->free_4kpbl) {
                                 nes_debug(NES_DBG_MR, "Out of 4KB Pbls.\n");
-                                if (cqp_request->dynamic) {
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                        kfree(cqp_request);
-                                } else {
-                                        list_add_tail(&cqp_request->list, &nesdev->cqp_avail_reqs);
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                }
+                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+                                nes_free_cqp_request(nesdev, cqp_request);
                                 return -ENOMEM;
                         } else {
                                 nesadapter->free_4kpbl -= pbl_count;
@@ -1956,13 +1936,8 @@ static int nes_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd,
                 } else {
                         if (pbl_count > nesadapter->free_256pbl) {
                                 nes_debug(NES_DBG_MR, "Out of 256B Pbls.\n");
-                                if (cqp_request->dynamic) {
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                        kfree(cqp_request);
-                                } else {
-                                        list_add_tail(&cqp_request->list, &nesdev->cqp_avail_reqs);
-                                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                }
+                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+                                nes_free_cqp_request(nesdev, cqp_request);
                                 return -ENOMEM;
                         } else {
                                 nesadapter->free_256pbl -= pbl_count;