[PATCH 2/3] scsi: bnx2fc: no double pointer for io_bdt_pool

[Rosen Penev]

Instead of allocating a double pointer, allocate a single and avoid
extra malloc and free. It's not needed anyway.

Signed-off-by: Rosen Penev <rosenp@xxxxxxxxx>
---
 drivers/scsi/bnx2fc/bnx2fc.h    |  2 +-
 drivers/scsi/bnx2fc/bnx2fc_io.c | 25 +++++--------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 30d8b563db0c..9a5de1048542 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -280,7 +280,7 @@ struct bnx2fc_cmd_mgr {
 	u16 next_idx;
 	struct list_head *free_list;
 	spinlock_t *free_list_lock;
-	struct io_bdt **io_bdt_pool;
+	struct io_bdt *io_bdt_pool;
 	struct bnx2fc_cmd *cmds[];
 };
 
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 4810999976b6..6773f8d5d84e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -242,7 +242,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)
 	}
 
 	cmgr->hba = hba;
-	cmgr->io_bdt_pool = (struct io_bdt **)(cmgr->cmds + num_ios);
+	cmgr->io_bdt_pool = (struct io_bdt *)(cmgr->cmds + num_ios);
 	cmgr->free_list = (struct list_head *)(cmgr->io_bdt_pool + num_ios);
 	cmgr->free_list_lock = (spinlock_t *)(cmgr->free_list + arr_sz);
 
@@ -280,19 +280,10 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)
 		io_req++;
 	}
 
-	for (i = 0; i < num_ios; i++) {
-		cmgr->io_bdt_pool[i] = kmalloc_obj(struct io_bdt);
-		if (!cmgr->io_bdt_pool[i]) {
-			printk(KERN_ERR PFX "failed to alloc "
-				"io_bdt_pool[%d]\n", i);
-			goto mem_err;
-		}
-	}
-
 	/* Allocate an map fcoe_bdt_ctx structures */
 	bd_tbl_sz = BNX2FC_MAX_BDS_PER_CMD * sizeof(struct fcoe_bd_ctx);
 	for (i = 0; i < num_ios; i++) {
-		bdt_info = cmgr->io_bdt_pool[i];
+		bdt_info = &cmgr->io_bdt_pool[i];
 		bdt_info->bd_tbl = dma_alloc_coherent(&hba->pcidev->dev,
 						      bd_tbl_sz,
 						      &bdt_info->bd_tbl_dma,
@@ -325,7 +316,7 @@ void bnx2fc_cmd_mgr_free(struct bnx2fc_cmd_mgr *cmgr)
 
 	bd_tbl_sz = BNX2FC_MAX_BDS_PER_CMD * sizeof(struct fcoe_bd_ctx);
 	for (i = 0; i < num_ios; i++) {
-		bdt_info = cmgr->io_bdt_pool[i];
+		bdt_info = &cmgr->io_bdt_pool[i];
 		if (bdt_info->bd_tbl) {
 			dma_free_coherent(&hba->pcidev->dev, bd_tbl_sz,
 					    bdt_info->bd_tbl,
@@ -334,12 +325,6 @@ void bnx2fc_cmd_mgr_free(struct bnx2fc_cmd_mgr *cmgr)
 		}
 	}
 
-	/* Destroy io_bdt pool */
-	for (i = 0; i < num_ios; i++) {
-		kfree(cmgr->io_bdt_pool[i]);
-		cmgr->io_bdt_pool[i] = NULL;
-	}
-
 	for (i = 0; i < num_possible_cpus() + 1; i++)  {
 		struct bnx2fc_cmd *tmp, *io_req;
 
@@ -415,7 +400,7 @@ struct bnx2fc_cmd *bnx2fc_elstm_alloc(struct bnx2fc_rport *tgt, int type)
 
 	/* Bind io_bdt for this io_req */
 	/* Have a static link between io_req and io_bdt_pool */
-	bd_tbl = io_req->bd_tbl = cmd_mgr->io_bdt_pool[xid];
+	bd_tbl = io_req->bd_tbl = &cmd_mgr->io_bdt_pool[xid];
 	bd_tbl->io_req = io_req;
 
 	/* Hold the io_req  against deletion */
@@ -468,7 +453,7 @@ struct bnx2fc_cmd *bnx2fc_cmd_alloc(struct bnx2fc_rport *tgt)
 
 	/* Bind io_bdt for this io_req */
 	/* Have a static link between io_req and io_bdt_pool */
-	bd_tbl = io_req->bd_tbl = cmd_mgr->io_bdt_pool[xid];
+	bd_tbl = io_req->bd_tbl = &cmd_mgr->io_bdt_pool[xid];
 	bd_tbl->io_req = io_req;
 
 	/* Hold the io_req  against deletion */
-- 
2.54.0