[firefly] [PATCH] scsi: lpfc: lpfc_init: use kcalloc for allocating memory

[Matei Oprea]

It's easier to use kcalloc for allocating arrays. While at it
also remove useless casting value.

Signed-off-by: Matei Oprea <eu at opreamatei.ro>
Cc: ROSEdu Kernel Community <firefly at lists.rosedu.org>
---
 drivers/scsi/lpfc/lpfc_init.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index e286909..2b1a786 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4742,12 +4742,14 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba)
 			phba->cfg_sg_seg_cnt = LPFC_DEFAULT_MENLO_SG_SEG_CNT;
 	}
 
-	if (!phba->sli.ring) {
+	if (unlikely(!phba->sli.ring)) {
 		phba->sli.ring = kcalloc(LPFC_SLI3_MAX_RING,
 				sizeof(struct lpfc_sli_ring),
 				GFP_KERNEL);
-		return -ENOMEM;
 	}
+
+	if (!phba->sli.ring)
+		return -ENOMEM;
 
 	/*
 	 * Since lpfc_sg_seg_cnt is module parameter, the sg_dma_buf_size
-- 
1.9.1